diff options
| author | smatz <smatz@openttd.org> | 2009-01-25 22:50:00 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2009-01-25 22:50:00 +0000 |
| commit | 7bc60a19d0a1ce914b7791abde84ebe22a89e7eb (patch) | |
| tree | a986eee014be68daf4b377c717b5bfd08c995946 /src/saveload | |
| parent | 7668633f9262315be8191202d03b47600ae19437 (diff) | |
| download | openttd-7bc60a19d0a1ce914b7791abde84ebe22a89e7eb.tar.xz | |
(svn r15274) -Fix (r8705): oldloader wasn't updated to use 64bit airport_flags
Diffstat (limited to 'src/saveload')
| -rw-r--r-- | src/saveload/oldloader.cpp | 1 | ||||
| -rw-r--r-- | src/saveload/oldloader.h | 1 | ||||
| -rw-r--r-- | src/saveload/oldloader_sl.cpp | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/saveload/oldloader.cpp b/src/saveload/oldloader.cpp index 1d17cb55c..5c1dd39ef 100644 --- a/src/saveload/oldloader.cpp +++ b/src/saveload/oldloader.cpp @@ -163,6 +163,7 @@ bool LoadChunk(LoadgameState *ls, void *base, const OldChunks *chunks) case OC_VAR_I32:*(int32 *)ptr = res; break; case OC_VAR_U32:*(uint32*)ptr = res; break; case OC_VAR_I64:*(int64 *)ptr = res; break; + case OC_VAR_U64:*(uint64*)ptr = res; break; default: NOT_REACHED(); } diff --git a/src/saveload/oldloader.h b/src/saveload/oldloader.h index c449c8cd4..c6b073b28 100644 --- a/src/saveload/oldloader.h +++ b/src/saveload/oldloader.h @@ -47,6 +47,7 @@ enum OldChunkType { OC_VAR_I32 = 5 << 8, OC_VAR_U32 = 6 << 8, OC_VAR_I64 = 7 << 8, + OC_VAR_U64 = 8 << 8, /* 8 bits allocated (256 max) */ OC_FILE_I8 = 1 << 16, diff --git a/src/saveload/oldloader_sl.cpp b/src/saveload/oldloader_sl.cpp index bae21a99c..1de407082 100644 --- a/src/saveload/oldloader_sl.cpp +++ b/src/saveload/oldloader_sl.cpp @@ -777,10 +777,10 @@ static const OldChunks station_chunk[] = { OCL_SVAR( OC_UINT8, Station, owner ), OCL_SVAR( OC_UINT8, Station, facilities ), OCL_SVAR( OC_TTD | OC_UINT8, Station, airport_type ), - OCL_SVAR( OC_TTO | OC_FILE_U16 | OC_VAR_U32, Station, airport_flags ), + OCL_SVAR( OC_TTO | OC_FILE_U16 | OC_VAR_U64, Station, airport_flags ), OCL_NULL( 3 ), ///< bus/truck status, blocked months, no longer in use OCL_CNULL( OC_TTD, 1 ), ///< unknown - OCL_SVAR( OC_TTD | OC_FILE_U16 | OC_VAR_U32, Station, airport_flags ), + OCL_SVAR( OC_TTD | OC_FILE_U16 | OC_VAR_U64, Station, airport_flags ), OCL_CNULL( OC_TTD, 2 ), ///< last_vehicle. now last_vehicle_type OCL_CNULL( OC_TTD, 4 ), ///< junk at end of chunk |