cpp/openttd-patchpack/source Changeset - r14783:012e1147d0d4

Changeset - r14783:012e1147d0d4

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

yexo - 14 years ago 2010-03-10 18:59:40
yexo@openttd.org

(svn r19382) -Fix (r19381): don't break savegame version 139

3 files changed with 13 insertions and 11 deletions:

src/saveload/afterload.cpp

src/saveload/saveload.cpp

src/saveload/station_sl.cpp

0 comments (0 inline, 0 general)

src/saveload/afterload.cpp

➞

Show inline comments

@@ @@ -2076,14 +2076,6 @@ bool AfterLoadGame() @@
+	}
 	if (CheckSavegameVersion(139)) {
 		Station *st;
 		FOR_ALL_STATIONS(st) {
 			if (st->airport.tile != INVALID_TILE) {
 				st->airport.w = st->GetAirportSpec()->size_x;
 				st->airport.h = st->GetAirportSpec()->size_y;
+			}
+		}
 		Train *t;
 		FOR_ALL_TRAINS(t) {
 			/* Copy old GOINGUP / GOINGDOWN flags. */
@@ @@ -2097,6 +2089,16 @@ bool AfterLoadGame() @@
+		}
+	}
 	if (CheckSavegameVersion(140)) {
 		Station *st;
 		FOR_ALL_STATIONS(st) {
 			if (st->airport.tile != INVALID_TILE) {
 				st->airport.w = st->GetAirportSpec()->size_x;
 				st->airport.h = st->GetAirportSpec()->size_y;
+			}
+		}
+	}
 	/* Road stops is 'only' updating some caches */
 	AfterLoadRoadStops();
 	AfterLoadLabelMaps();

src/saveload/saveload.cpp

➞

Show inline comments

@@ @@ -46,7 +46,7 @@ @@
 #include "saveload_internal.h"
-extern const uint16 SAVEGAME_VERSION = 139;
+extern const uint16 SAVEGAME_VERSION = 140;
 SavegameType _savegame_type; ///< type of savegame we are loading

src/saveload/station_sl.cpp

➞

Show inline comments

@@ @@ -332,8 +332,8 @@ static const SaveLoad _station_desc[] = @@
 	      SLE_REF(Station, truck_stops,                REF_ROADSTOPS),
 	      SLE_VAR(Station, dock_tile,                  SLE_UINT32),
 	      SLE_VAR(Station, airport.tile,               SLE_UINT32),
 	  SLE_CONDVAR(Station, airport.w,                  SLE_UINT8, 139, SL_MAX_VERSION),
 	  SLE_CONDVAR(Station, airport.h,                  SLE_UINT8, 139, SL_MAX_VERSION),
 	  SLE_CONDVAR(Station, airport.w,                  SLE_UINT8, 140, SL_MAX_VERSION),
 	  SLE_CONDVAR(Station, airport.h,                  SLE_UINT8, 140, SL_MAX_VERSION),
 	      SLE_VAR(Station, airport_type,               SLE_UINT8),
 	      SLE_VAR(Station, airport_flags,              SLE_UINT64),

0 comments (0 inline, 0 general)