summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--player.h2
-rw-r--r--signs.c4
-rw-r--r--table/files.h38
-rw-r--r--ttd.c2
4 files changed, 23 insertions, 23 deletions
diff --git a/player.h b/player.h
index a205b4fdf..52752e1b6 100644
--- a/player.h
+++ b/player.h
@@ -112,7 +112,7 @@ typedef struct PlayerAiNew {
byte action;
- uint last_id; // here is stored the last id of the searched city/industry
+ int last_id; // here is stored the last id of the searched city/industry
uint last_vehiclecheck_date; // Used in CheckVehicle
Ai_SpecialVehicle special_vehicles[AI_MAX_SPECIAL_VEHICLES]; // Some vehicles have some special flags
diff --git a/signs.c b/signs.c
index a3228ddcf..72cebbe31 100644
--- a/signs.c
+++ b/signs.c
@@ -19,7 +19,7 @@ static void UpdateSignVirtCoords(SignStruct *ss)
/**
*
- * Update all coordinates of a sign
+ * Update the coordinates of all signs
*
*/
void UpdateAllSignVirtCoords()
@@ -65,7 +65,7 @@ static SignStruct *AllocateSign()
/**
*
- * Place a sign at the giving x/y
+ * Place a sign at the given x/y
*
* @param p1 not used
* @param p2 not used
diff --git a/table/files.h b/table/files.h
index 56742c64e..c476251ef 100644
--- a/table/files.h
+++ b/table/files.h
@@ -1,22 +1,22 @@
-/*
+/*
MD5 sums of graphics files
- DOS -
-
- TRG1.GRF 9311676280e5b14077a8ee41c1b42192
- TRGC.GRF ed446637e034104c5559b32c18afe78d
- TRGH.GRF ee6616fb0e6ef6b24892c58c93d86fc9
- TRGI.GRF da6a6c9dcc451eec88d79211437b76a8
- TRGT.GRF fcde1d7e8a74197d72a62695884b909e
- SAMPLE.CAT 422ea3dd074d2859bb51639a6e0e85da
-
- WINDOWS -
-
- TRG1R.GRF b04ce593d8c5016e07473a743d7d3358
- TRGCR.GRF 3668f410c761a050b5e7095a2b14879b
- TRGHR.GRF 06bf2b7a31766f048baac2ebe43457b1
- TRGIR.GRF 0c2484ff6be49fc63a83be6ab5c38f32
- TRGTR.GRF de53650517fe661ceaa3138c6edb0eb8
+ DOS -
+
+ TRG1.GRF 9311676280e5b14077a8ee41c1b42192
+ TRGC.GRF ed446637e034104c5559b32c18afe78d
+ TRGH.GRF ee6616fb0e6ef6b24892c58c93d86fc9
+ TRGI.GRF da6a6c9dcc451eec88d79211437b76a8
+ TRGT.GRF fcde1d7e8a74197d72a62695884b909e
+ SAMPLE.CAT 422ea3dd074d2859bb51639a6e0e85da
+
+ WINDOWS -
+
+ TRG1R.GRF b04ce593d8c5016e07473a743d7d3358
+ TRGCR.GRF 3668f410c761a050b5e7095a2b14879b
+ TRGHR.GRF 06bf2b7a31766f048baac2ebe43457b1
+ TRGIR.GRF 0c2484ff6be49fc63a83be6ab5c38f32
+ TRGTR.GRF de53650517fe661ceaa3138c6edb0eb8
SAMPLE.CAT 9212e81e72badd4bbe1eaeae66458e10
*/
@@ -26,7 +26,7 @@ FileList files_dos = {
{ "TRG1.GRF", {0x93,0x11,0x67,0x62,0x80,0xe5,0xb1,0x40,0x77,0xa8,0xee,0x41,0xc1,0xb4,0x21,0x92} },
{ "TRGI.GRF", {0xda,0x6a,0x6c,0x9d,0xcc,0x45,0x1e,0xec,0x88,0xd7,0x92,0x11,0x43,0x7b,0x76,0xa8} },
{ "signalsw.grf", {0x76,0x1b,0x42,0x25,0x44,0x0d,0x21,0xc7,0xe0,0xb4,0x25,0xd8,0x2f,0xc8,0x52,0x38} }, //0x1320 - 0x1405 inclusive
- { NULL }
+ { NULL, {} }
},
{ { "TRGC.GRF", {0xed,0x44,0x66,0x37,0xe0,0x34,0x10,0x4c,0x55,0x59,0xb3,0x2c,0x18,0xaf,0xe7,0x8d} },
{ "TRGH.GRF", {0xee,0x66,0x16,0xfb,0x0e,0x6e,0xf6,0xb2,0x48,0x92,0xc5,0x8c,0x93,0xd8,0x6f,0xc9} },
@@ -39,7 +39,7 @@ FileList files_win = {
{ "TRG1R.GRF", {0xb0,0x4c,0xe5,0x93,0xd8,0xc5,0x01,0x6e,0x07,0x47,0x3a,0x74,0x3d,0x7d,0x33,0x58} },
{ "TRGIR.GRF", {0x0c,0x24,0x84,0xff,0x6b,0xe4,0x9f,0xc6,0x3a,0x83,0xbe,0x6a,0xb5,0xc3,0x8f,0x32} },
{ "signalsw.grf", {0x76,0x1b,0x42,0x25,0x44,0x0d,0x21,0xc7,0xe0,0xb4,0x25,0xd8,0x2f,0xc8,0x52,0x38} }, //0x1320 - 0x1405 inclusive
- { NULL }
+ { NULL, {} }
},
{ { "TRGCR.GRF", {0x36,0x68,0xf4,0x10,0xc7,0x61,0xa0,0x50,0xb5,0xe7,0x09,0x5a,0x2b,0x14,0x87,0x9b} },
{ "TRGHR.GRF", {0x06,0xbf,0x2b,0x7a,0x31,0x76,0x6f,0x04,0x8b,0xaa,0xc2,0xeb,0xe4,0x34,0x57,0xb1} },
diff --git a/ttd.c b/ttd.c
index d90a66aec..6bae4e950 100644
--- a/ttd.c
+++ b/ttd.c
@@ -657,7 +657,7 @@ int ttd_main(int argc, char* argv[])
if (sounddriver[0]) ttd_strlcpy(_ini_sounddriver, sounddriver, sizeof(_ini_sounddriver));
if (videodriver[0]) ttd_strlcpy(_ini_videodriver, videodriver, sizeof(_ini_videodriver));
if (resolution[0]) { _cur_resolution[0] = resolution[0]; _cur_resolution[1] = resolution[1]; }
- if (startdate != -1) _patches.starting_date = startdate;
+ if (startdate != (uint)-1) _patches.starting_date = startdate;
if (_dedicated_forks && !_dedicated_enabled)
_dedicated_forks = false;