(svn r124) Prepared code for removal of block_months variable in next major savegame version
authordominik
Mon, 23 Aug 2004 21:29:25 +0000
changeset 123 d550772c61e6
parent 122 6e56237f536c
child 124 3da466676241
(svn r124) Prepared code for removal of block_months variable in next major savegame version
oldloader.c
station.h
station_cmd.c
ttd.c
--- a/oldloader.c	Mon Aug 23 21:12:51 2004 +0000
+++ b/oldloader.c	Mon Aug 23 21:29:25 2004 +0000
@@ -106,7 +106,7 @@
 	byte facilities;
 	byte airport_type;
 	byte truck_stop_status, bus_stop_status;
-	byte blocked_months;
+	byte blocked_months_obsolete;
 	byte unk85;
 	uint16 airport_flags;
 	uint16 last_vehicle;
@@ -708,7 +708,7 @@
 		s->airport_type = o->airport_type;
 		s->truck_stop_status = o->truck_stop_status;
 		s->bus_stop_status = o->bus_stop_status;
-		s->blocked_months = o->blocked_months;
+		s->blocked_months_obsolete = o->blocked_months_obsolete;
 		s->airport_flags = o->airport_flags;
 		s->last_vehicle = o->last_vehicle;
 	} while (s++,o++,--num);
--- a/station.h	Mon Aug 23 21:12:51 2004 +0000
+++ b/station.h	Mon Aug 23 21:29:25 2004 +0000
@@ -37,7 +37,7 @@
 	byte airport_type;
 	byte truck_stop_status;
 	byte bus_stop_status;
-	byte blocked_months;
+	byte blocked_months_obsolete;
 
 	// trainstation width/height
 	byte trainst_w, trainst_h;
--- a/station_cmd.c	Mon Aug 23 21:12:51 2004 +0000
+++ b/station_cmd.c	Mon Aug 23 21:29:25 2004 +0000
@@ -2510,7 +2510,9 @@
 	SLE_VAR(Station,airport_type,				SLE_UINT8),
 	SLE_VAR(Station,truck_stop_status,	SLE_UINT8),
 	SLE_VAR(Station,bus_stop_status,		SLE_UINT8),
-	SLE_VAR(Station,blocked_months,			SLE_UINT8),
+			
+	// blocked_months was stored here in savegame format 0 - 4.0
+	SLE_CONDVAR(Station,blocked_months_obsolete,	SLE_UINT8, 0, 4),
 
 	SLE_CONDVAR(Station,airport_flags,			SLE_VAR_U32 | SLE_FILE_U16, 0, 2),
 	SLE_CONDVAR(Station,airport_flags,			SLE_UINT32, 3, 255),
--- a/ttd.c	Mon Aug 23 21:12:51 2004 +0000
+++ b/ttd.c	Mon Aug 23 21:29:25 2004 +0000
@@ -1047,7 +1047,7 @@
 		t->exclusivity=(byte)-1;
 	}
 	
-	/* FIXME old exclusive rights status is not being imported.
+	/* FIXME old exclusive rights status is not being imported (stored in s->blocked_months_obsolete)
 			could be implemented this way:
 			1.) Go through all stations
 					Build an array town_blocked[ town_id ][ player_id ]