(svn r223) -Fix: Const correctness and miscellaneous fixes. Thank you Tron for your diligent fixing of warnings (and some possibly bugs) (Tron)

-CodeLayout: Remove trailing spaces and Windows linebreaks

7 files changed, 125 insertions, 125 deletions

diff --git a/table/landscape_const.h b/table/landscape_const.h
index a438670ef..6b48b465d 100644
--- a/table/landscape_const.h
+++ b/table/landscape_const.h
@@ -66,7 +66,7 @@ static const LandscapePredefVar _landscape_predef_var[4] = {
 			STR_000E,
 			STR_001F_PAPER,
 			STR_0020_GOLD,
-			STR_001E_FOOD,			
+			STR_001E_FOOD,
 		},
 		/* hilly weights */
 		{
diff --git a/table/landscape_sprite.h b/table/landscape_sprite.h
index c96445aba..4dacee426 100644
--- a/table/landscape_sprite.h
+++ b/table/landscape_sprite.h
@@ -132,7 +132,7 @@ static const SpriteID _landscape_spriteindexes_3[] = {
 };
 
 
-/* Slope graphics indexes temperate climate 
+/* Slope graphics indexes temperate climate
 Skip first 3 sprites and only load the proper set */
 static const SpriteID _slopes_spriteindexes_0[] = {
  0xfffe,  3,
@@ -148,7 +148,7 @@ static const SpriteID _slopes_spriteindexes_1[] = {
  0xffff,
 };
 
-/* Slope graphics indexes tropical climate 
+/* Slope graphics indexes tropical climate
 Skip first 155 sprites and only load the proper set */
 static const SpriteID _slopes_spriteindexes_2[] = {
  0xfffe,  155,
diff --git a/table/palettes.h b/table/palettes.h
index f6ee1409b..fd4a77f38 100644
--- a/table/palettes.h
+++ b/table/palettes.h
@@ -1,70 +1,70 @@
 byte _palettes[4][256 * 3] = {
 /* palette 1 */
 {
-0,   0,   0,   212,   0, 212,   212,   0, 212,   212,   0, 212, 
-212,   0, 212,   212,   0, 212,   212,   0, 212,   212,   0, 212, 
-212,   0, 212,   212,   0, 212,   168, 168, 168,   184, 184, 184, 
-200, 200, 200,   216, 216, 216,   232, 232, 232,   252, 252, 252, 
- 52,  60,  72,    68,  76,  92,    88,  96, 112,   108, 116, 132, 
-132, 140, 152,   156, 160, 172,   176, 184, 196,   204, 208, 220, 
- 48,  44,   4,    64,  60,  12,    80,  76,  20,    96,  92,  28, 
-120, 120,  64,   148, 148, 100,   176, 176, 132,   204, 204, 168, 
-100, 100, 100,   116, 116, 116,   104,  80,  44,   124, 104,  72, 
-152, 132,  92,   184, 160, 120,   212, 188, 148,   244, 220, 176, 
-132, 132, 132,    88,   4,  16,   112,  16,  32,   136,  32,  52, 
-160,  56,  76,   188,  84, 108,   204, 104, 124,   220, 132, 144, 
-236, 156, 164,   252, 188, 192,   252, 212,   0,   252, 232,  60, 
-252, 248, 128,    76,  40,   0,    96,  60,   8,   116,  88,  28, 
-136, 116,  56,   156, 136,  80,   176, 156, 108,   196, 180, 136, 
- 68,  24,   0,    96,  44,   4,   128,  68,   8,   156,  96,  16, 
-184, 120,  24,   212, 156,  32,   232, 184,  16,   252, 212,   0, 
-252, 248, 128,   252, 252, 192,    32,   4,   0,    64,  20,   8, 
- 84,  28,  16,   108,  44,  28,   128,  56,  40,   148,  72,  56, 
-168,  92,  76,   184, 108,  88,   196, 128, 108,   212, 148, 128, 
-  8,  52,   0,    16,  64,   0,    32,  80,   4,    48,  96,   4, 
- 64, 112,  12,    84, 132,  20,   104, 148,  28,   128, 168,  44, 
- 64,  64,  64,    44,  68,  32,    60,  88,  48,    80, 104,  60, 
-104, 124,  76,   128, 148,  92,   152, 176, 108,   180, 204, 124, 
- 16,  52,  24,    32,  72,  44,    56,  96,  72,    76, 116,  88, 
- 96, 136, 108,   120, 164, 136,   152, 192, 168,   184, 220, 200, 
- 32,  24,   0,    56,  28,   0,    80,  80,  80,    88,  52,  12, 
-104,  64,  24,   124,  84,  44,   140, 108,  64,   160, 128,  88, 
- 76,  40,  16,    96,  52,  24,   116,  68,  40,   136,  84,  56, 
-164,  96,  64,   184, 112,  80,   204, 128,  96,   212, 148, 112, 
-224, 168, 128,   236, 188, 148,    80,  28,   4,   100,  40,  20, 
-120,  56,  40,   140,  76,  64,   160, 100,  96,   184, 136, 136, 
- 36,  40,  68,    48,  52,  84,    64,  64, 100,    80,  80, 116, 
-100, 100, 136,   132, 132, 164,   172, 172, 192,   212, 212, 224, 
- 48,  48,  48,    64,  44, 144,    88,  64, 172,   104,  76, 196, 
-120,  88, 224,   140, 104, 252,   160, 136, 252,   188, 168, 252, 
-  0,  24, 108,     0,  36, 132,     0,  52, 160,     0,  72, 184, 
-  0,  96, 212,    24, 120, 220,    56, 144, 232,    88, 168, 240, 
-128, 196, 252,   188, 224, 252,    16,  64,  96,    24,  80, 108, 
- 40,  96, 120,    52, 112, 132,    80, 140, 160,   116, 172, 192, 
-156, 204, 220,   204, 240, 252,   172,  52,  52,   212,  52,  52, 
-252,  52,  52,   252, 100,  88,   252, 144, 124,   252, 184, 160, 
-252, 216, 200,   252, 244, 236,    72,  20, 112,    92,  44, 140, 
-112,  68, 168,   140, 100, 196,   168, 136, 224,   204, 180, 252, 
-204, 180, 252,   232, 208, 252,    60,   0,   0,    92,   0,   0, 
-128,   0,   0,   160,   0,   0,   196,   0,   0,   224,   0,   0, 
-252,   0,   0,   252,  80,   0,   252, 108,   0,   252, 136,   0, 
-252, 164,   0,   252, 192,   0,   252, 220,   0,   252, 252,   0, 
-204, 136,   8,   228, 144,   4,   252, 156,   0,   252, 176,  48, 
-252, 196, 100,   252, 216, 152,     8,  24,  88,    12,  36, 104, 
- 20,  52, 124,    28,  68, 140,    40,  92, 164,    56, 120, 188, 
- 72, 152, 216,   100, 172, 224,    92, 156,  52,   108, 176,  64, 
-124, 200,  76,   144, 224,  92,   224, 244, 252,   204, 240, 252, 
-180, 220, 236,   132, 188, 216,    88, 152, 172,    16,  16,  16, 
- 32,  32,  32,     8,  92, 104,    16, 100, 112,    24, 108, 120, 
- 32, 116, 128,    44, 124, 140,    92, 164, 184,   116, 180, 196, 
-148, 200, 216,   180, 220, 232,   216, 244, 252,     0,   0,   0, 
-  0,   0,   0,     0,   0,   0,     0,   0,   0,     0,   0,   0, 
-252,  60,   0,   252,  80,   0,   252, 104,   0,   252, 128,   0, 
-252, 148,   0,   252, 172,   0,   252, 196,   0,   252,   0,   0, 
-252,   0,   0,     0,   0,   0,     0,   0,   0,     0,   0,   0, 
-252, 228,   0,   148, 148, 148,   212,   0, 212,   212,   0, 212, 
-212,   0, 212,   212,   0, 212,   212,   0, 212,   212,   0, 212, 
-212,   0, 212,   212,   0, 212,   212,   0, 212,   252, 252, 252, 
+0,   0,   0,   212,   0, 212,   212,   0, 212,   212,   0, 212,
+212,   0, 212,   212,   0, 212,   212,   0, 212,   212,   0, 212,
+212,   0, 212,   212,   0, 212,   168, 168, 168,   184, 184, 184,
+200, 200, 200,   216, 216, 216,   232, 232, 232,   252, 252, 252,
+ 52,  60,  72,    68,  76,  92,    88,  96, 112,   108, 116, 132,
+132, 140, 152,   156, 160, 172,   176, 184, 196,   204, 208, 220,
+ 48,  44,   4,    64,  60,  12,    80,  76,  20,    96,  92,  28,
+120, 120,  64,   148, 148, 100,   176, 176, 132,   204, 204, 168,
+100, 100, 100,   116, 116, 116,   104,  80,  44,   124, 104,  72,
+152, 132,  92,   184, 160, 120,   212, 188, 148,   244, 220, 176,
+132, 132, 132,    88,   4,  16,   112,  16,  32,   136,  32,  52,
+160,  56,  76,   188,  84, 108,   204, 104, 124,   220, 132, 144,
+236, 156, 164,   252, 188, 192,   252, 212,   0,   252, 232,  60,
+252, 248, 128,    76,  40,   0,    96,  60,   8,   116,  88,  28,
+136, 116,  56,   156, 136,  80,   176, 156, 108,   196, 180, 136,
+ 68,  24,   0,    96,  44,   4,   128,  68,   8,   156,  96,  16,
+184, 120,  24,   212, 156,  32,   232, 184,  16,   252, 212,   0,
+252, 248, 128,   252, 252, 192,    32,   4,   0,    64,  20,   8,
+ 84,  28,  16,   108,  44,  28,   128,  56,  40,   148,  72,  56,
+168,  92,  76,   184, 108,  88,   196, 128, 108,   212, 148, 128,
+  8,  52,   0,    16,  64,   0,    32,  80,   4,    48,  96,   4,
+ 64, 112,  12,    84, 132,  20,   104, 148,  28,   128, 168,  44,
+ 64,  64,  64,    44,  68,  32,    60,  88,  48,    80, 104,  60,
+104, 124,  76,   128, 148,  92,   152, 176, 108,   180, 204, 124,
+ 16,  52,  24,    32,  72,  44,    56,  96,  72,    76, 116,  88,
+ 96, 136, 108,   120, 164, 136,   152, 192, 168,   184, 220, 200,
+ 32,  24,   0,    56,  28,   0,    80,  80,  80,    88,  52,  12,
+104,  64,  24,   124,  84,  44,   140, 108,  64,   160, 128,  88,
+ 76,  40,  16,    96,  52,  24,   116,  68,  40,   136,  84,  56,
+164,  96,  64,   184, 112,  80,   204, 128,  96,   212, 148, 112,
+224, 168, 128,   236, 188, 148,    80,  28,   4,   100,  40,  20,
+120,  56,  40,   140,  76,  64,   160, 100,  96,   184, 136, 136,
+ 36,  40,  68,    48,  52,  84,    64,  64, 100,    80,  80, 116,
+100, 100, 136,   132, 132, 164,   172, 172, 192,   212, 212, 224,
+ 48,  48,  48,    64,  44, 144,    88,  64, 172,   104,  76, 196,
+120,  88, 224,   140, 104, 252,   160, 136, 252,   188, 168, 252,
+  0,  24, 108,     0,  36, 132,     0,  52, 160,     0,  72, 184,
+  0,  96, 212,    24, 120, 220,    56, 144, 232,    88, 168, 240,
+128, 196, 252,   188, 224, 252,    16,  64,  96,    24,  80, 108,
+ 40,  96, 120,    52, 112, 132,    80, 140, 160,   116, 172, 192,
+156, 204, 220,   204, 240, 252,   172,  52,  52,   212,  52,  52,
+252,  52,  52,   252, 100,  88,   252, 144, 124,   252, 184, 160,
+252, 216, 200,   252, 244, 236,    72,  20, 112,    92,  44, 140,
+112,  68, 168,   140, 100, 196,   168, 136, 224,   204, 180, 252,
+204, 180, 252,   232, 208, 252,    60,   0,   0,    92,   0,   0,
+128,   0,   0,   160,   0,   0,   196,   0,   0,   224,   0,   0,
+252,   0,   0,   252,  80,   0,   252, 108,   0,   252, 136,   0,
+252, 164,   0,   252, 192,   0,   252, 220,   0,   252, 252,   0,
+204, 136,   8,   228, 144,   4,   252, 156,   0,   252, 176,  48,
+252, 196, 100,   252, 216, 152,     8,  24,  88,    12,  36, 104,
+ 20,  52, 124,    28,  68, 140,    40,  92, 164,    56, 120, 188,
+ 72, 152, 216,   100, 172, 224,    92, 156,  52,   108, 176,  64,
+124, 200,  76,   144, 224,  92,   224, 244, 252,   204, 240, 252,
+180, 220, 236,   132, 188, 216,    88, 152, 172,    16,  16,  16,
+ 32,  32,  32,     8,  92, 104,    16, 100, 112,    24, 108, 120,
+ 32, 116, 128,    44, 124, 140,    92, 164, 184,   116, 180, 196,
+148, 200, 216,   180, 220, 232,   216, 244, 252,     0,   0,   0,
+  0,   0,   0,     0,   0,   0,     0,   0,   0,     0,   0,   0,
+252,  60,   0,   252,  80,   0,   252, 104,   0,   252, 128,   0,
+252, 148,   0,   252, 172,   0,   252, 196,   0,   252,   0,   0,
+252,   0,   0,     0,   0,   0,     0,   0,   0,     0,   0,   0,
+252, 228,   0,   148, 148, 148,   212,   0, 212,   212,   0, 212,
+212,   0, 212,   212,   0, 212,   212,   0, 212,   212,   0, 212,
+212,   0, 212,   212,   0, 212,   212,   0, 212,   252, 252, 252,
 }};
 
 #define GET_PALETTE(x) _palettes[x]
diff --git a/table/road_land.h b/table/road_land.h
index 4c5ce66b8..5328bc6a1 100644
--- a/table/road_land.h
+++ b/table/road_land.h
@@ -43,7 +43,7 @@ static const SpriteID _road_tile_sprites_1[16] = {
 
 
 
-#define MAKELINE(a,b,c) ADD_WORD(a), b, c, 
+#define MAKELINE(a,b,c) ADD_WORD(a), b, c,
 static const byte _road_display_datas2_0[] = {
 	0,0
 };
diff --git a/table/station_land.h b/table/station_land.h
index 772d9cf48..6042b6c0a 100644
--- a/table/station_land.h
+++ b/table/station_land.h
@@ -536,7 +536,7 @@ static const byte _station_display_datas_82[] = {
 	TILE_SEQ_END()
 };
 
-// end of runway 
+// end of runway
 const byte _station_display_datas_083[] = {
 	TILE_SEQ_BEGIN(0xA59)
 	TILE_SEQ_END()
@@ -570,7 +570,7 @@ const byte _station_display_datas_087[] = {
 	TILE_SEQ_END()
 };
 
-// end of runway 
+// end of runway
 const byte _station_display_datas_088[] = {
 	TILE_SEQ_BEGIN(0xA59)
 	TILE_SEQ_LINE(  0,  0,  0, 16,  1,  6, 0x8A68) // fences
@@ -580,7 +580,7 @@ const byte _station_display_datas_088[] = {
 // runway tiles
 const byte _station_display_datas_089[] = {
 	TILE_SEQ_BEGIN(0xA56)
-	TILE_SEQ_LINE(  0,  0,  0, 16,  1,  6, 0x8A68) // fences	
+	TILE_SEQ_LINE(  0,  0,  0, 16,  1,  6, 0x8A68) // fences
 	TILE_SEQ_END()
 };
 
@@ -857,28 +857,28 @@ static const byte * const _station_display_datas[] = {
 	_station_display_datas_087,
 	_station_display_datas_088,
 	_station_display_datas_089,
-	_station_display_datas_090,		
-	_station_display_datas_091,	
-	_station_display_datas_092,	
-	_station_display_datas_093,	
-	_station_display_datas_094,	
-	_station_display_datas_095,	
-	_station_display_datas_096,	
-	_station_display_datas_097,	
-	_station_display_datas_098,	
-	_station_display_datas_099,	
+	_station_display_datas_090,
+	_station_display_datas_091,
+	_station_display_datas_092,
+	_station_display_datas_093,
+	_station_display_datas_094,
+	_station_display_datas_095,
+	_station_display_datas_096,
+	_station_display_datas_097,
+	_station_display_datas_098,
+	_station_display_datas_099,
 	_station_display_datas_0100,
-	_station_display_datas_0101,		
-	_station_display_datas_0102,		
-	_station_display_datas_0103,	
-	_station_display_datas_0104,	
-	_station_display_datas_0105,	
-	_station_display_datas_0106,	
-	_station_display_datas_0107,	
-	_station_display_datas_0108,	
-	_station_display_datas_0109,	
-	_station_display_datas_0110,	
-	_station_display_datas_0111,	
+	_station_display_datas_0101,
+	_station_display_datas_0102,
+	_station_display_datas_0103,
+	_station_display_datas_0104,
+	_station_display_datas_0105,
+	_station_display_datas_0106,
+	_station_display_datas_0107,
+	_station_display_datas_0108,
+	_station_display_datas_0109,
+	_station_display_datas_0110,
+	_station_display_datas_0111,
 	_station_display_datas_0112,
 	_station_display_datas_0113,
   _station_display_datas_0114,
diff --git a/table/train_cmd.h b/table/train_cmd.h
index ddcd381bb..10a74e123 100644
--- a/table/train_cmd.h
+++ b/table/train_cmd.h
@@ -1,43 +1,43 @@
 static const SpriteID _engine_sprite_base[] = {
-0x0B59, 0x0B61, 0x0B69, 0x0BE1, 0x0B71, 0x0B75, 0x0B7D, 0x0B7D, 
-0x0B85, 0x0B85, 0x0B8D, 0x0B8D, 0x0BC9, 0x0BD1, 0x0BD9, 0x0BE9, 
-0x0BED, 0x0BED, 0x0BF5, 0x0BF9, 0x0B79, 0x0B9D, 0x0B9D, 0x0B95, 
-0x0B95, 0x0BA5, 0x0BA9, 0x0BA9, 0x0BC1, 0x0BC5, 0x0BB1, 0x0BB9, 
-0x0BB9, 0x0AAD, 0x0AB1, 0x0AB5, 0x0AB9, 0x0ABD, 0x0AC1, 0x0AC9, 
-0x0ACD, 0x0AD5, 0x0AD1, 0x0AD9, 0x0AC5, 0x0AD1, 0x0AD5, 0x0AF9, 
-0x0AFD, 0x0B05, 0x0AB9, 0x0AC1, 0x0AC9, 0x0AD1, 0x0AD9, 0x0AE1, 
-0x0AE5, 0x0AE9, 0x0AF1, 0x0AF9, 0x0B0D, 0x0B11, 0x0B15, 0x0B19, 
-0x0B1D, 0x0B21, 0x0B29, 0x0B2D, 0x0B35, 0x0B31, 0x0B39, 0x0B25, 
-0x0B31, 0x0B35, 
+0x0B59, 0x0B61, 0x0B69, 0x0BE1, 0x0B71, 0x0B75, 0x0B7D, 0x0B7D,
+0x0B85, 0x0B85, 0x0B8D, 0x0B8D, 0x0BC9, 0x0BD1, 0x0BD9, 0x0BE9,
+0x0BED, 0x0BED, 0x0BF5, 0x0BF9, 0x0B79, 0x0B9D, 0x0B9D, 0x0B95,
+0x0B95, 0x0BA5, 0x0BA9, 0x0BA9, 0x0BC1, 0x0BC5, 0x0BB1, 0x0BB9,
+0x0BB9, 0x0AAD, 0x0AB1, 0x0AB5, 0x0AB9, 0x0ABD, 0x0AC1, 0x0AC9,
+0x0ACD, 0x0AD5, 0x0AD1, 0x0AD9, 0x0AC5, 0x0AD1, 0x0AD5, 0x0AF9,
+0x0AFD, 0x0B05, 0x0AB9, 0x0AC1, 0x0AC9, 0x0AD1, 0x0AD9, 0x0AE1,
+0x0AE5, 0x0AE9, 0x0AF1, 0x0AF9, 0x0B0D, 0x0B11, 0x0B15, 0x0B19,
+0x0B1D, 0x0B21, 0x0B29, 0x0B2D, 0x0B35, 0x0B31, 0x0B39, 0x0B25,
+0x0B31, 0x0B35,
 };
 
 /* For how many directions do we have sprites? (8 or 4; if 4, the other 4
  * directions are symmetric. */
 static const byte _engine_sprite_and[] = {
-7, 7, 7, 7, 3, 3, 7, 7, 
-7, 7, 7, 7, 7, 7, 7, 3, 
-7, 7, 3, 7, 3, 7, 7, 7, 
-7, 3, 7, 7, 3, 3, 7, 7, 
-7, 3, 3, 3, 3, 3, 3, 3, 
-3, 3, 3, 3, 3, 3, 3, 3, 
-3, 3, 3, 3, 3, 3, 3, 3, 
-3, 3, 3, 3, 3, 3, 3, 3, 
-3, 3, 3, 3, 3, 3, 3, 3, 
-3, 3, 
+7, 7, 7, 7, 3, 3, 7, 7,
+7, 7, 7, 7, 7, 7, 7, 3,
+7, 7, 3, 7, 3, 7, 7, 7,
+7, 3, 7, 7, 3, 3, 7, 7,
+7, 3, 3, 3, 3, 3, 3, 3,
+3, 3, 3, 3, 3, 3, 3, 3,
+3, 3, 3, 3, 3, 3, 3, 3,
+3, 3, 3, 3, 3, 3, 3, 3,
+3, 3, 3, 3, 3, 3, 3, 3,
+3, 3,
 };
 
 /* Non-zero for multihead trains. */
 static const byte _engine_sprite_add[] = {
-0, 0, 0, 0, 0, 0, 0, 4, 
-0, 4, 0, 4, 0, 0, 0, 0, 
-0, 4, 0, 0, 0, 0, 4, 0, 
-4, 0, 0, 4, 0, 0, 0, 0, 
-4, 0, 0, 0, 0, 0, 0, 0, 
-0, 0, 0, 0, 0, 0, 0, 0, 
-0, 0, 0, 0, 0, 0, 0, 0, 
-0, 0, 0, 0, 0, 0, 0, 0, 
-0, 0, 0, 0, 0, 0, 0, 0, 
-0, 0, 
+0, 0, 0, 0, 0, 0, 0, 4,
+0, 4, 0, 4, 0, 0, 0, 0,
+0, 4, 0, 0, 0, 0, 4, 0,
+4, 0, 0, 4, 0, 0, 0, 0,
+4, 0, 0, 0, 0, 0, 0, 0,
+0, 0, 0, 0, 0, 0, 0, 0,
+0, 0, 0, 0, 0, 0, 0, 0,
+0, 0, 0, 0, 0, 0, 0, 0,
+0, 0, 0, 0, 0, 0, 0, 0,
+0, 0,
 };
 
 
diff --git a/table/water_land.h b/table/water_land.h
index 6bd86d4b4..df11ecaa7 100644
--- a/table/water_land.h
+++ b/table/water_land.h
@@ -3,8 +3,8 @@ static const byte _shipdepot_display_seq_1[] = {
 
 	0,15,0,16,1,0x14,
 	ADD_WORD(0x8FE8),
-	
-	0x80 
+
+	0x80
 };
 
 static const byte _shipdepot_display_seq_2[] = {
@@ -121,7 +121,7 @@ static const byte _shiplift_display_seq_3t[] = {
 	ADD_WORD(0xFDD),
 	0, 0, 0, 1, 0x10, 0x14, ADD_WORD(SPR_CANALS_BASE + 9 + 16 + 3),
 	0xF, 0, 0, 1, 0x10, 0x14, ADD_WORD(SPR_CANALS_BASE + 9 + 20 + 3),
-	0x80, 8	
+	0x80, 8
 };
 
 static const byte * const _shiplift_display_seq[] = {