Add IMAGE_GN_N for N up to 15.

Warzone2100 · Jan 13, 2011 · 6f6ec2e · 6f6ec2e
1 parent a3e5ea7
commit 6f6ec2e
Show file tree

Hide file tree

Showing 5 changed files with 498 additions and 7 deletions.
diff --git a/data/base/images/intfac.img b/data/base/images/intfac.img
@@ -345,6 +345,12 @@
 4,231,102,23,13,0,0,"IMAGE VDP UP"
 4,230,116,25,15,-1,-1,"IMAGE VDP HI"
 2,49,99,4,5,0,0,"IMAGE GN STAR"
+2,183,0,4,5,0,0,"IMAGE GN 15"
+2,187,0,4,5,0,0,"IMAGE GN 14"
+2,191,0,4,5,0,0,"IMAGE GN 13"
+2,195,0,4,5,0,0,"IMAGE GN 12"
+2,199,0,4,5,0,0,"IMAGE GN 11"
+2,203,0,4,5,0,0,"IMAGE GN 10"
 2,44,99,4,5,0,0,"IMAGE GN 9"
 2,39,99,4,5,0,0,"IMAGE GN 8"
 2,34,99,4,5,0,0,"IMAGE GN 7"
@@ -353,7 +359,7 @@
 2,19,99,4,5,0,0,"IMAGE GN 4"
 2,14,99,4,5,0,0,"IMAGE GN 3"
 2,9,99,4,5,0,0,"IMAGE GN 2"
-2,5,99,2,5,0,0,"IMAGE GN 1"
+2,5,99,2,5,1,0,"IMAGE GN 1"
 2,0,99,4,5,0,0,"IMAGE GN 0"
 4,74,126,36,24,0,0,"IMAGE ORD CIRCLEUP"
 4,111,126,36,24,0,0,"IMAGE ORD CIRCLEDOWN"
@@ -466,12 +472,12 @@
 2,1,157,36,24,0,0,"IMAGE ORD FIREDES UP"
 2,38,157,36,24,0,0,"IMAGE ORD FIREDES DOWN"
 3,0,97,11,12,0,-9,"IMAGE ASCII64"
-0,127,152,7,10,0,0,"IMAGE LFTTAB" 	
-0,127,165,7,10,0,0,"IMAGE LFTTABD" 
-0,126,179,9,14,0,0,"IMAGE LFTTABH" 
-0,137,152,7,10,0,0,"IMAGE RGTTAB"		
-0,137,165,7,10,0,0,"IMAGE RGTTABD" 
-0,134,179,9,14,0,0,"IMAGE RGTTABH" 
+0,127,152,7,10,0,0,"IMAGE LFTTAB"
+0,127,165,7,10,0,0,"IMAGE LFTTABD"
+0,126,179,9,14,0,0,"IMAGE LFTTABH"
+0,137,152,7,10,0,0,"IMAGE RGTTAB"
+0,137,165,7,10,0,0,"IMAGE RGTTABD"
+0,134,179,9,14,0,0,"IMAGE RGTTABH"
 0,134,179,9,14,0,0,"IMAGE NADDA"
 5,0,59,36,24,0,0,"IMAGE ORD PATROLUP"
 5,37,59,36,24,0,0,"IMAGE ORD PATROLDOWN"

diff --git a/data/base/images/intfac2.png b/data/base/images/intfac2.png
diff --git a/src/intfac.h b/src/intfac.h
@@ -372,6 +372,12 @@ enum {
 	IMAGE_VDP_UP,
 	IMAGE_VDP_HI,
 	IMAGE_GN_STAR,
+	IMAGE_GN_15,
+	IMAGE_GN_14,
+	IMAGE_GN_13,
+	IMAGE_GN_12,
+	IMAGE_GN_11,
+	IMAGE_GN_10,
 	IMAGE_GN_9,
 	IMAGE_GN_8,
 	IMAGE_GN_7,

diff --git a/src/multiint.cpp b/src/multiint.cpp
@@ -126,6 +126,8 @@
 #define WZCOL_TERC3_GROUND_LOW  pal_Colour(0x00, 0x1C, 0x0E)
 #define WZCOL_TERC3_GROUND_HIGH WZCOL_TERC3_CLIFF_HIGH
 
+static const unsigned gnImage[] = {IMAGE_GN_0, IMAGE_GN_1, IMAGE_GN_2, IMAGE_GN_3, IMAGE_GN_4, IMAGE_GN_5, IMAGE_GN_6, IMAGE_GN_7, IMAGE_GN_8, IMAGE_GN_9, IMAGE_GN_10, IMAGE_GN_11, IMAGE_GN_12, IMAGE_GN_13, IMAGE_GN_14, IMAGE_GN_15};
+
 // ////////////////////////////////////////////////////////////////////////////
 // vars
 extern char	MultiCustomMapsPath[PATH_MAX];