Import more conditional orders patch

http://www.tt-forums.net/viewtopic.php?p=1033223#p1033223
This commit is contained in:
patch-import
2015-08-26 22:19:35 +01:00
committed by Jonathan G Rennison
parent 789266146f
commit c757a97214
10 changed files with 327 additions and 14 deletions

View File

@@ -111,6 +111,7 @@ const SaveLoad *GetOrderDescription()
SLE_CONDVAR(Order, wait_time, SLE_UINT16, 67, SL_MAX_VERSION),
SLE_CONDVAR(Order, travel_time, SLE_UINT16, 67, SL_MAX_VERSION),
SLE_CONDVAR(Order, max_speed, SLE_UINT16, 172, SL_MAX_VERSION),
SLE_CONDVAR(Order, jump_counter, SLE_INT8, SL_CONDORDERS, SL_MAX_VERSION),
/* Leftover from the minor savegame version stuff
* We will never use those free bytes, but we have to keep this line to allow loading of old savegames */

View File

@@ -240,7 +240,7 @@
* 174 23973 1.2.x
* 175 24136
*/
extern const uint16 SAVEGAME_VERSION = 175; ///< Current savegame version of OpenTTD.
extern const uint16 SAVEGAME_VERSION = SL_CONDORDERS; ///< Current savegame version of OpenTTD.
SavegameType _savegame_type; ///< type of savegame we are loading

View File

@@ -87,7 +87,7 @@ enum SLRefType {
/** Highest possible savegame version. */
#define SL_MAX_VERSION 255
#define SL_CONDORDERS 200
/** Flags of a chunk. */
enum ChunkType {
CH_RIFF = 0,