From b01c63cd23b3c60de3b48478b5287cdaeffed974 Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 16 Sep 2010 16:31:38 +0000 Subject: (svn r20815) -Revert (r20814): wrong patch at wrong time... --- src/saveload/saveload.cpp | 3 +-- src/saveload/station_sl.cpp | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'src/saveload') diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index ce604d0a6..ba2178717 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -211,9 +211,8 @@ * 146 20446 * 147 20621 * 148 20659 - * 149 TODO */ -extern const uint16 SAVEGAME_VERSION = 149; ///< current savegame version of OpenTTD +extern const uint16 SAVEGAME_VERSION = 148; ///< current savegame version of OpenTTD SavegameType _savegame_type; ///< type of savegame we are loading diff --git a/src/saveload/station_sl.cpp b/src/saveload/station_sl.cpp index dabb3e251..72d7c7ecf 100644 --- a/src/saveload/station_sl.cpp +++ b/src/saveload/station_sl.cpp @@ -238,7 +238,6 @@ const SaveLoad *GetGoodsDesc() SLE_VAR(GoodsEntry, last_age, SLE_UINT8), SLEG_CONDVAR( _cargo_feeder_share, SLE_FILE_U32 | SLE_VAR_I64, 14, 64), SLEG_CONDVAR( _cargo_feeder_share, SLE_INT64, 65, 67), - SLE_CONDVAR(GoodsEntry, amount_fract, SLE_UINT8, 149, SL_MAX_VERSION), SLE_CONDLST(GoodsEntry, cargo.packets, REF_CARGO_PACKET, 68, SL_MAX_VERSION), SLE_END() -- cgit v1.2.3-54-g00ecf