(svn r6923) -Codechange: Load nsignalsw.grf in the same way as other mandatory additional grfs

3 files changed, 7 insertions, 4 deletions

diff --git a/gfxinit.c b/gfxinit.c
index f862bdc64..d934ec108 100644
--- a/gfxinit.c
+++ b/gfxinit.c
@@ -21,7 +21,7 @@ typedef struct MD5File {
 } MD5File;
 
 typedef struct FileList {
-	const MD5File basic[5];     // grf files that always have to be loaded
+	const MD5File basic[4];     // grf files that always have to be loaded
 	const MD5File landscape[3]; // landscape specific grf files
 } FileList;
 
@@ -344,6 +344,9 @@ static void LoadSpriteTables(void)
 		);
 	}
 
+	assert(load_index == SPR_SIGNALS_BASE);
+	load_index += LoadGrfFile("nsignalsw.grf", load_index, i++);
+
 	assert(load_index == SPR_CANALS_BASE);
 	load_index += LoadGrfFile("canalsw.grf", load_index, i++);
 
diff --git a/table/files.h b/table/files.h
index 7bcbf64bf..65c635027 100644
--- a/table/files.h
+++ b/table/files.h
@@ -28,7 +28,6 @@ static FileList files_dos = {
 		{ "TRG1.GRF",      {0x93, 0x11, 0x67, 0x62, 0x80, 0xe5, 0xb1, 0x40, 0x77, 0xa8, 0xee, 0x41, 0xc1, 0xb4, 0x21, 0x92} }, //    0 - 4792 inclusive
 		{ "TRGI.GRF",      {0xda, 0x6a, 0x6c, 0x9d, 0xcc, 0x45, 0x1e, 0xec, 0x88, 0xd7, 0x92, 0x11, 0x43, 0x7b, 0x76, 0xa8} }, // 4793 - 4889 inclusive
 		{ "dosdummy.grf",  {0x07, 0x01, 0xe6, 0xc4, 0x07, 0x6a, 0x5b, 0xc3, 0xf4, 0x9f, 0x01, 0xad, 0x21, 0x6c, 0xa0, 0xc2} }, // 4890 - 4895 inclusive
-		{ "nsignalsw.grf", {0x65, 0xb9, 0xd7, 0x30, 0x56, 0x06, 0xcc, 0x9e, 0x27, 0x57, 0xc8, 0xe4, 0x9b, 0xb3, 0x66, 0x81} }, // 4896 - 5381 inclusive
 		{ NULL, { 0 } }
 	}, {
 		{ "TRGC.GRF",      {0xed, 0x44, 0x66, 0x37, 0xe0, 0x34, 0x10, 0x4c, 0x55, 0x59, 0xb3, 0x2c, 0x18, 0xaf, 0xe7, 0x8d} },
@@ -41,7 +40,6 @@ static FileList files_win = {
 	{
 		{ "TRG1R.GRF",     {0xb0, 0x4c, 0xe5, 0x93, 0xd8, 0xc5, 0x01, 0x6e, 0x07, 0x47, 0x3a, 0x74, 0x3d, 0x7d, 0x33, 0x58} }, //    0 - 4792 inclusive
 		{ "TRGIR.GRF",     {0x0c, 0x24, 0x84, 0xff, 0x6b, 0xe4, 0x9f, 0xc6, 0x3a, 0x83, 0xbe, 0x6a, 0xb5, 0xc3, 0x8f, 0x32} }, // 4793 - 4895 inclusive
-		{ "nsignalsw.grf", {0x65, 0xb9, 0xd7, 0x30, 0x56, 0x06, 0xcc, 0x9e, 0x27, 0x57, 0xc8, 0xe4, 0x9b, 0xb3, 0x66, 0x81} }, // 4896 - 5381 inclusive
 		{ NULL, { 0 } },
 		{ NULL, { 0 } }
 	}, {
@@ -55,6 +53,7 @@ static MD5File sample_cat_win = { "SAMPLE.CAT", {0x92, 0x12, 0xe8, 0x1e, 0x72, 0
 static MD5File sample_cat_dos = { "SAMPLE.CAT", {0x42, 0x2e, 0xa3, 0xdd, 0x07, 0x4d, 0x28, 0x59, 0xbb, 0x51, 0x63, 0x9a, 0x6e, 0x0e, 0x85, 0xda} };
 
 static MD5File files_openttd[] = {
+	{ "nsignalsw.grf", { 0x65, 0xb9, 0xd7, 0x30, 0x56, 0x06, 0xcc, 0x9e, 0x27, 0x57, 0xc8, 0xe4, 0x9b, 0xb3, 0x66, 0x81 } },
 	{ "2ccmap.grf",    { 0x20, 0x03, 0x32, 0x1a, 0x43, 0x6c, 0xc1, 0x05, 0x80, 0xbd, 0x43, 0xeb, 0xe1, 0xfd, 0x0c, 0x62 } },
 	{ "airports.grf",  { 0xfd, 0xa4, 0x38, 0xd6, 0x9c, 0x81, 0x74, 0xfe, 0xa0, 0x98, 0xa2, 0x14, 0x4b, 0x15, 0xb8, 0x4b } },
 	{ "autorail.grf",  { 0xed, 0x44, 0x7f, 0xbb, 0x19, 0x44, 0x48, 0x4c, 0x07, 0x8a, 0xb1, 0xc1, 0x5c, 0x12, 0x3a, 0x60 } },
diff --git a/table/sprites.h b/table/sprites.h
index 9406de826..6f6b7b3ef 100644
--- a/table/sprites.h
+++ b/table/sprites.h
@@ -49,7 +49,8 @@ enum Sprites {
 
 	/* Extra graphic spritenumbers */
 	OPENTTD_SPRITES_COUNT = 116, // number of gfx-sprites in openttd.grf
-	SPR_CANALS_BASE   = 5382,
+	SPR_SIGNALS_BASE  = 4896,
+	SPR_CANALS_BASE   = SPR_SIGNALS_BASE + 486,
 	SPR_SLOPES_BASE   = SPR_CANALS_BASE + 70,
 	SPR_AUTORAIL_BASE = SPR_SLOPES_BASE + 78,
 	SPR_ELRAIL_BASE   = SPR_AUTORAIL_BASE + 55,