cpp/openttd-patchpack/source Changeset - r123:d36538b7e502

Changeset - r123:d36538b7e502

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

dominik - 20 years ago 2004-08-23 21:29:25
dominik@openttd.org

(svn r124) Prepared code for removal of block_months variable in next major savegame version

4 files changed with 7 insertions and 5 deletions:

oldloader.c

station.h

station_cmd.c

ttd.c

0 comments (0 inline, 0 general)

oldloader.c

➞

Show inline comments

@@ @@ -106,7 +106,7 @@ typedef struct { @@
 	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 @@ static void FixStation(Station *s, OldSt @@
 		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);

station.h

➞

Show inline comments

@@ @@ -37,7 +37,7 @@ struct Station { @@
 	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;

station_cmd.c

➞

Show inline comments

@@ @@ -2510,7 +2510,9 @@ static const byte _station_desc[] = { @@
 	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),

ttd.c

➞

Show inline comments

@@ @@ -1047,7 +1047,7 @@ void UpdateExclusiveRights() @@
 		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:
 .) Go through all stations
 					Build an array town_blocked[ town_id ][ player_id ]

0 comments (0 inline, 0 general)