(svn r2030) -Fix: Save _cur_town_ctr with all its bits to prevent desyncs
authorcelestar
Sat, 19 Mar 2005 22:45:59 +0000
changeset 1526 93edd03da666
parent 1525 e617df782f26
child 1527 3d204567b05b
(svn r2030) -Fix: Save _cur_town_ctr with all its bits to prevent desyncs
misc.c
saveload.c
--- a/misc.c	Sat Mar 19 22:41:55 2005 +0000
+++ b/misc.c	Sat Mar 19 22:45:59 2005 +0000
@@ -772,12 +772,8 @@
 	{&_station_tick_ctr, 				SLE_UINT16, 0, 255},
 	{&_random_seeds[0][0], 					SLE_UINT32, 0, 255},
 	{&_random_seeds[0][1], 					SLE_UINT32, 0, 255},
-	/* XXX: We save only a portion of the _cur_town_ctr, this should be
-	 * fixed in the next revision bump. It does not hurt so much since
-	 * it just gives a small single-time penalty to the towns with higher
-	 * IDs at the load time. _cur_town_ctr is zeroed in InitializeTowns()
-	 * so the higher octets do not interfere at this time. */
-	{&_cur_town_ctr, 						SLE_UINT8,	0, 255},
+	{&_cur_town_ctr, 						SLE_FILE_U8 | SLE_VAR_U32,	0, 9},
+	{&_cur_town_ctr,						SLE_UINT32, 10, 255},
 	{&_cur_player_tick_index, 	SLE_FILE_U8 | SLE_VAR_UINT, 0, 255},
 	{&_next_competitor_start, 	SLE_FILE_U16 | SLE_VAR_UINT, 0, 255},
 	{&_trees_tick_ctr, 					SLE_UINT8,	0, 255},
--- a/saveload.c	Sat Mar 19 22:41:55 2005 +0000
+++ b/saveload.c	Sat Mar 19 22:45:59 2005 +0000
@@ -8,7 +8,7 @@
 #include "saveload.h"
 
 enum {
-	SAVEGAME_MAJOR_VERSION = 9,
+	SAVEGAME_MAJOR_VERSION = 10,
 	SAVEGAME_MINOR_VERSION = 0,
 
 	SAVEGAME_LOADABLE_VERSION = (SAVEGAME_MAJOR_VERSION << 8) + SAVEGAME_MINOR_VERSION