From 58b9996958c9dbe2800872659bf4c745c1450e3e Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Sun, 18 Dec 2011 14:41:42 +0000
Subject: [PATCH] More icons for display modes

---
 .gitignore      |   3 ++-
 font/font.bin   | Bin 30980 -> 31028 bytes
 includes/font.h |  24 ++++++++++++------------
 src/interface.c |  45 ++++++++++++++++++++++++++-------------------
 4 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3e294cd6d..eb3ec8ba2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,5 @@ src/python/stdlib/*
 *.dll
 *.srv
 *.bat
-*.o
\ No newline at end of file
+*.o
+*.me
\ No newline at end of file
diff --git a/font/font.bin b/font/font.bin
index 8c34f74dbd599356f6300753b99259af7f9a373e..ea3687daf46f9705777a43599360794ad8e32a95 100644
GIT binary patch
delta 960
zcmcIiOHRWu5cSweNn!_76~eEgDc!IDRD{HeMTNSde3z6J0tJr2rWdH@B1L7#C3=OP
z0MrY>IF6I3D}?CSktfe@{AN5J%;0?nt_lN>538%g*wu44c?|=?%0pG`pC_eKeqmuC
zrDr#NM+mnt{a48&EopxB=K*)cD`7GWhSQy~1D)hS2o5Z>MfiBr*n9*o^0OD?<8@;z
zm9e#Gng93k?P&vJsA0Q*ilb)hg)?R*t%94WWlMP3|0@Tp5Mk#o#7S%Ei0Y#2G{w;Z
z!Za|&NLO2i84|~@t2*|(;X$^`bX3YChg-7tSpFD*VY3$P6$nr;n8zYgMcq@KNvem_
zvlzd-!3hJ-?IFKuwc+DO64SjlaS}PlIyL?A(tyG!3tK+0493s<h~n2NUg2d=V*OBU
hL!JlaM9l$HGbsYL*P@hn(Nnlz3vhHU$G6YU@(-N}IWGVJ

delta 127
zcmdn;iLvDqBMT1~C*wpx(TNId6BRPlxOliAfQJo4b8vI>@Ngmk7dJNtP<Y~gF-eFr
i1jz|wPF7?To@~I#f{r&EGdiYjR>>CN+dL<G0}B9&4-@DB

diff --git a/includes/font.h b/includes/font.h
index c5a9ded1c..5e2be5b17 100644
--- a/includes/font.h
+++ b/includes/font.h
@@ -222,13 +222,13 @@ char font_data[] = {
     0x05, 0x6F, 0xBC, 0xF1, 0xC6, 0x1B, 0x6F, 0xBC, 0xF1, 0xC6, 0x1B, 0x6F, 0x00, 0x00, 
     0x08, 0xE4, 0x6F, 0xE4, 0x6F, 0xE4, 0x6F, 0xE4, 0x6F, 0xE4, 0x6F, 0xE4, 0x6F, 0xE4, 0x6F, 0xE4, 0x6F, 0xE4, 0x6F, 0x00, 0x00, 
     0x09, 0x00, 0xE4, 0x03, 0x90, 0x0F, 0x40, 0x3E, 0x00, 0xF9, 0x00, 0xE4, 0x03, 0x90, 0x0F, 0x40, 0x3E, 0x00, 0xF9, 0x00, 0xE4, 0x03, 0x00, 0x00, 
-    0x06, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07, 
-    0x06, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07, 
-    0x06, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07, 
-    0x06, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07, 
-    0x06, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07, 
-    0x06, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07, 
-    0x06, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07, 
+    0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF0, 0x3F, 0x00, 0xFF, 0x03, 0xF0, 0x3F, 0x00, 0xFF, 0x03, 0xF0, 0x3F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x0A, 0x08, 0x82, 0xE0, 0xBA, 0x2E, 0x08, 0x82, 0x80, 0x20, 0x08, 0xAE, 0xEB, 0x82, 0x20, 0x08, 0x08, 0x82, 0xE0, 0xBA, 0x2E, 0x08, 0x82, 0x00, 0x00, 0x00, 
+    0x0A, 0x00, 0x30, 0x00, 0x00, 0x03, 0x30, 0xFC, 0x00, 0x43, 0x07, 0xFC, 0x20, 0x40, 0x07, 0x30, 0x20, 0x00, 0x03, 0x00, 0xFC, 0x00, 0x40, 0x07, 0x00, 0x20, 
+    0x0A, 0x00, 0x43, 0xC0, 0x20, 0x1D, 0x20, 0x61, 0x00, 0x44, 0x00, 0x00, 0x00, 0x00, 0x84, 0x01, 0x24, 0xB4, 0xF1, 0x01, 0xFE, 0x0F, 0xD0, 0x0F, 0x00, 0xFC, 
+    0x0A, 0x00, 0x00, 0x00, 0x54, 0x00, 0x90, 0x1A, 0x40, 0xFE, 0x06, 0xE4, 0x6F, 0x40, 0xFE, 0x06, 0x90, 0x1A, 0x00, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x10, 0x88, 0x88, 0x88, 0x55, 0x55, 0x55, 0xFF, 0x00, 0x54, 0x55, 0x55, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+    0x0A, 0x00, 0x01, 0x00, 0x10, 0x00, 0x00, 0x02, 0x00, 0x64, 0x00, 0xA5, 0x6B, 0x01, 0x64, 0x00, 0x00, 0x02, 0x00, 0x10, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 
     0x06, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07, 
     0x06, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07, 
     0x06, 0x74, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0xDC, 0xC0, 0x0C, 0x99, 0x31, 0x30, 0x89, 0x41, 0x07, 
@@ -288,11 +288,11 @@ short font_ptrs[] = {
     0x0CA8, 0x0CC2, 0x0CDC, 0x0CF6, 0x0D10, 0x0D2A, 0x0D44, 0x0D5E,
     0x0D78, 0x0D92, 0x0DAC, 0x0DC6, 0x0DE0, 0x0DFA, 0x0E14, 0x0E2E,
     0x0E46, 0x0E60, 0x0E7A, 0x0E94, 0x0EAE, 0x0EC8, 0x0EE2, 0x0EFC,
-    0x0F16, 0x0F24, 0x0F39, 0x0F51, 0x0F61, 0x0F71, 0x0F81, 0x0F91,
-    0x0FA1, 0x0FB1, 0x0FC1, 0x0FD1, 0x0FE1, 0x0FF1, 0x1001, 0x1011,
-    0x1021, 0x1031, 0x1041, 0x1051, 0x1061, 0x1071, 0x1081, 0x1091,
-    0x10A1, 0x10B1, 0x10C1, 0x10D1, 0x10E1, 0x10F1, 0x1101, 0x1111,
-    0x1121, 0x1131, 0x1141, 0x1151, 0x1161, 0x1171, 0x1181, 0x1191,
+    0x0F16, 0x0F24, 0x0F39, 0x0F51, 0x0F6B, 0x0F85, 0x0F9F, 0x0FB9,
+    0x0FD3, 0x0FF0, 0x100A, 0x101A, 0x102A, 0x103A, 0x104A, 0x105A,
+    0x106A, 0x107A, 0x108A, 0x109A, 0x10AA, 0x10BA, 0x10CA, 0x10DA,
+    0x10EA, 0x10FA, 0x110A, 0x111A, 0x112A, 0x113A, 0x114A, 0x115A,
+    0x116A, 0x117A, 0x118A, 0x119A, 0x11AA, 0x11BA, 0x11CA, 0x11DA,
 };
 #endif
 #endif
diff --git a/src/interface.c b/src/interface.c
index 92193d9ef..3f33e9ae6 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -6260,41 +6260,48 @@ void drawIcon(pixel * vid_buf, int x, int y, int cmode)
 {
 	switch (cmode)
 	{
-	case CM_VEL:
+	case 0x98:
 		drawtext(vid_buf, x, y, "\x98", 128, 160, 255, 255);
 		break;
-	case CM_PRESS:
+	case 0x99:
 		drawtext(vid_buf, x, y, "\x99", 255, 212, 32, 255);
 		break;
-	case CM_PERS:
+	case 0x9A:
 		drawtext(vid_buf, x, y, "\x9A", 212, 212, 212, 255);
 		break;
-	case CM_FIRE:
+	case 0x9B:
 		drawtext(vid_buf, x+1, y, "\x9B", 255, 0, 0, 255);
 		drawtext(vid_buf, x+1, y, "\x9C", 255, 255, 64, 255);
 		break;
-	case CM_BLOB:
+	case 0xBF:
 		drawtext(vid_buf, x, y, "\xBF", 55, 255, 55, 255);
 		break;
-	case CM_HEAT:
+	case 0xBE:
 		drawtext(vid_buf, x+2, y, "\xBE", 255, 0, 0, 255);
 		drawtext(vid_buf, x+2, y, "\xBD", 255, 255, 255, 255);
 		break;
-	case CM_FANCY:
+	case 0xC4:
 		drawtext(vid_buf, x, y, "\xC4", 100, 150, 255, 255);
 		break;
-	case CM_NOTHING:
-		//drawtext(vid_buf, x, y, "\xD1", 100, 150, 255, 255);
-		drawtext(vid_buf, x, y, "\x00", 100, 150, 255, 255);
-		break;
-	case CM_GRAD:
+	case 0xD3:
 		drawtext(vid_buf, x, y, "\xD3", 255, 50, 255, 255);
 		break;
-	case CM_LIFE:
-		//drawtext(vid_buf, x, y, "\xD1", 255, 50, 255, 255);
-		drawtext(vid_buf, x, y, "\x00", 255, 50, 255, 255);
+	case 0xE0:
+		drawtext(vid_buf, x, y, "\xE0", 255, 255, 255, 255);
 		break;
-	case CM_CRACK:
+	case 0xE1:
+		drawtext(vid_buf, x, y, "\xE1", 255, 255, 160, 255);
+		break;
+	case 0xDF:
+		drawtext(vid_buf, x, y, "\xDF", 200, 255, 255, 255);
+		break;
+	case 0xDE:
+		drawtext(vid_buf, x, y, "\xDE", 255, 255, 255, 255);
+		break;
+	case 0xDB:
+		drawtext(vid_buf, x, y, "\xDB", 255, 255, 200, 255);
+		break;
+	case 0xD4:
 		drawtext(vid_buf, x, y, "\xD4", 255, 55, 55, 255);
 		drawtext(vid_buf, x, y, "\xD5", 55, 255, 55, 255);
 		break;
@@ -6317,17 +6324,17 @@ void render_ui(pixel * vid_buf, int xcoord, int ycoord, int orientation)
 
 	int render_optioncount = 6;
 	int render_options[] = {RENDER_EFFE, RENDER_GLOW, RENDER_FIRE, RENDER_BLUR, RENDER_BLOB, RENDER_BASC};
-	int render_optionicons[] = {-1, -1, 3, 6, 4, -1};
+	int render_optionicons[] = {0xE1, 0xDF, 0x9B, 0xC4, 0xBF, 0xDB};
 	char * render_desc[] = {"Effects", "Glow", "Fire", "Blur", "Blob", "Basic"};
 	
 	int display_optioncount = 7;
 	int display_options[] = {DISPLAY_AIRC, DISPLAY_AIRP, DISPLAY_AIRV, DISPLAY_AIRH, DISPLAY_WARP, DISPLAY_PERS, DISPLAY_EFFE};
-	int display_optionicons[] = {10, 1, 0, 5, -1, 2, -1};
+	int display_optionicons[] = {0xD4, 0x99, 0x98, 0xBE, 0xDE, 0x9A, -1};
 	char * display_desc[] = {"Air: Cracker", "Air: Pressure", "Air: Velocity", "Air: Heat", "Warp effect", "Persistent", "Effects"};
 
 	int colour_optioncount = 3;
 	int colour_options[] = {COLOUR_LIFE, COLOUR_HEAT, COLOUR_GRAD};
-	int colour_optionicons[] = {9, 5, 8};
+	int colour_optionicons[] = {0xE0, 0xBE, 0xD3};
 	char * colour_desc[] = {"Life", "Heat", "Heat Gradient"};
 
 	yoffset = 16;