cpp/openttd-patchpack/source Changeset - r2588:5d7081ed502a

Changeset - r2588:5d7081ed502a

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

tron - 18 years ago 2005-11-03 15:25:45
tron@openttd.org

(svn r3125) Symbolic names for skiping sprites and the end of the sprite list

2 files changed with 96 insertions and 91 deletions:

gfxinit.c

table/landscape_sprite.h

0 comments (0 inline, 0 general)

gfxinit.c

➞

Show inline comments

@@ @@ -24,6 +24,11 @@ typedef struct FileList { @@
 	const MD5File landscape[3]; // landscape specific grf files
 } FileList;
 enum {
 	SKIP = 0xFFFE,
 	END  = 0xFFFF
 };
 #include "table/files.h"
 #include "table/landscape_sprite.h"
@@ @@ -69,10 +74,10 @@ static void LoadGrfIndexed(const char* f @@
 	DEBUG(spritecache, 2) ("Reading indexed grf-file ``%s''", filename);
-	for (; (start = *index_tbl++) != 0xffff;) {
+	while ((start = *index_tbl++) != END) {
 		uint end = *index_tbl++;
-		if (start == 0xfffe) { // skip sprites (amount in second var)
+		if (start == SKIP) { // skip sprites (amount in second var)
 			SkipSprites(end);
 		} else { // load sprites and use indexes from start to end
 			do {
@@ @@ -187,83 +192,83 @@ void CheckExternalFiles(void) @@
 static const SpriteID trg1idx[] = {
-,    1, // Mouse cursor, ZZZ
 ,    1, // Mouse cursor, ZZZ
 /* Medium font */
 ,   92, // ' ' till 'z'
 xFFFE,   36,
 ,  160, // Move ¾ to the correct position
 ,   98, // Up arrow
 ,  133,
 xFFFE,    1, // skip currency sign
 ,  135,
 xFFFE,    1,
 ,  137,
 xFFFE,    1,
 ,  139,
 ,  140, // TODO Down arrow
 ,  141,
 ,  142, // TODO Check mark
 ,  143, // TODO Cross
 ,  144,
 ,  145, // TODO Right arrow
 ,  149,
 ,  122, // Transport markers
 xFFFE,    2,
 ,  157,
 ,  115, // Small up/down arrows
 xFFFE,    1,
 ,  225,
 ,   92, // ' ' till 'z'
 	SKIP,   36,
 ,  160, // Move ¾ to the correct position
 ,   98, // Up arrow
 ,  133,
 	SKIP,    1, // skip currency sign
 ,  135,
 	SKIP,    1,
 ,  137,
 	SKIP,    1,
 ,  139,
 ,  140, // TODO Down arrow
 ,  141,
 ,  142, // TODO Check mark
 ,  143, // TODO Cross
 ,  144,
 ,  145, // TODO Right arrow
 ,  149,
 ,  122, // Transport markers
 	SKIP,    2,
 ,  157,
 ,  115, // Small up/down arrows
 	SKIP,    1,
 ,  225,
 /* Small font */
 ,  316, // ' ' till 'z'
 xFFFE,   36,
 ,  384, // Move ¾ to the correct position
 ,  322, // Up arrow
 ,  357,
 xFFFE,    1, // skip currency sign
 ,  359,
 xFFFE,    1,
 ,  361,
 xFFFE,    1,
 ,  363,
 ,  364, // TODO Down arrow
 ,  366,
 xFFFE,    1,
 ,  368,
 ,  369, // TODO Right arrow
 ,  373,
 xFFFE,    7,
 ,  381,
 xFFFE,    3,
 ,  449,
 ,  316, // ' ' till 'z'
 	SKIP,   36,
 ,  384, // Move ¾ to the correct position
 ,  322, // Up arrow
 ,  357,
 	SKIP,    1, // skip currency sign
 ,  359,
 	SKIP,    1,
 ,  361,
 	SKIP,    1,
 ,  363,
 ,  364, // TODO Down arrow
 ,  366,
 	SKIP,    1,
 ,  368,
 ,  369, // TODO Right arrow
 ,  373,
 	SKIP,    7,
 ,  381,
 	SKIP,    3,
 ,  449,
 /* Big font */
 ,  540, // ' ' till 'z'
 xFFFE,   36,
 ,  608, // Move ¾ to the correct position
 xFFFE,    1,
 ,  581,
 xFFFE,    1,
 ,  583,
 xFFFE,    5,
 ,  589,
 xFFFE,   15,
 ,  605,
 xFFFE,    3,
 ,  625,
 xFFFE,    1,
 ,  632,
 xFFFE,    1,
 ,  639,
 xFFFE,    1,
 ,  657,
 xFFFE,    1,
 ,  664,
 xFFFE,    2,
 ,  671,
 xFFFE,    1,
 ,  673,
 ,  540, // ' ' till 'z'
 	SKIP,   36,
 ,  608, // Move ¾ to the correct position
 	SKIP,    1,
 ,  581,
 	SKIP,    1,
 ,  583,
 	SKIP,    5,
 ,  589,
 	SKIP,   15,
 ,  605,
 	SKIP,    3,
 ,  625,
 	SKIP,    1,
 ,  632,
 	SKIP,    1,
 ,  639,
 	SKIP,    1,
 ,  657,
 	SKIP,    1,
 ,  664,
 	SKIP,    2,
 ,  671,
 	SKIP,    1,
 ,  673,
 /* Graphics */
 , 4792,
 xFFFF
 , 4792,
 	END
 };
 /* NOTE: When adding a normal sprite, increase OPENTTD_SPRITES_COUNT with the
@@ @@ -309,7 +314,7 @@ static const SpriteID _openttd_grf_index @@
 ,  96, // { | } ~ medium
 , 544, // { | } ~ large
 	SPR_HOUSE_ICON, SPR_HOUSE_ICON,
-xffff,
+	END
 };
 static byte _sprite_page_to_load = 0xFF;

table/landscape_sprite.h

➞

Show inline comments

@@ @@ -23,7 +23,7 @@ static const SpriteID _landscape_spritei @@
 x818,  0x81D,
 x3DE,  0x3EB,
 x1212, 0x1212,
-xffff,
+END
 };
 static const SpriteID _landscape_spriteindexes_2[] = {
@@ @@ -60,7 +60,7 @@ 0x118D, 0x11D8, @@
 xFF5,  0xFF5,
 xFF8,  0xFF8,
 x1212, 0x1212,
-xffff,
+END
 };
 static const SpriteID _landscape_spriteindexes_3[] = {
@@ @@ -130,38 +130,38 @@ 0x10E4, 0x1133, @@
 x514,  0x514,
 x511,  0x511,
 x322,  0x322,
-xffff,
+END
 };
 /* Slope graphics indexes temperate climate
 Skip first 3 sprites and only load the proper set */
 static const SpriteID _slopes_spriteindexes_0[] = {
 xfffe,  3,
  SPR_SLOPES_BASE, SPR_SLOPES_BASE+73,
 xffff,
 	SKIP, 3,
 	SPR_SLOPES_BASE, SPR_SLOPES_BASE + 73,
 	END
 };
 /* Slope graphics indexes arctic climate
 Skip first 79 sprites and only load the proper set */
 static const SpriteID _slopes_spriteindexes_1[] = {
 xfffe,  79,
  SPR_SLOPES_BASE, SPR_SLOPES_BASE+73,
 xffff,
 	SKIP, 79,
 	SPR_SLOPES_BASE, SPR_SLOPES_BASE + 73,
 	END
 };
 /* Slope graphics indexes tropical climate
 Skip first 155 sprites and only load the proper set */
 static const SpriteID _slopes_spriteindexes_2[] = {
 xfffe,  155,
  SPR_SLOPES_BASE, SPR_SLOPES_BASE+73,
 xffff,
 	SKIP, 155,
 	SPR_SLOPES_BASE, SPR_SLOPES_BASE + 73,
 	END
 };
 /* Slope graphics indexes toyland climate
 Skip first 231 sprites and only load the proper set */
 static const SpriteID _slopes_spriteindexes_3[] = {
 xfffe,  231,
  SPR_SLOPES_BASE, SPR_SLOPES_BASE+73,
 xffff,
 	SKIP, 231,
 	SPR_SLOPES_BASE, SPR_SLOPES_BASE + 73,
 	END
 };

0 comments (0 inline, 0 general)