(svn r3895) - Add proper SLE(G)_CONDNULL macros for the empty space reservation in savegames and update where used

- Also add this capability to settings
This commit is contained in:
Darkvater
2006-03-16 00:20:33 +00:00
parent 61bb1d5b9a
commit d9ee10d3b8
9 changed files with 34 additions and 23 deletions

View File

@@ -1150,7 +1150,7 @@ static const SaveLoad _player_desc[] = {
SLE_CONDVAR(Player,is_active, SLE_UINT8, 4, SL_MAX_VERSION),
// Engine renewal settings
SLE_CONDARR(NullStruct,null,SLE_FILE_U16 | SLE_VAR_NULL, 256, 16, 18),
SLE_CONDNULL(512, 16, 18),
SLE_CONDREF(Player,engine_renew_list, REF_ENGINE_RENEWS, 19, SL_MAX_VERSION),
SLE_CONDVAR(Player,engine_renew, SLE_UINT8, 16, SL_MAX_VERSION),
SLE_CONDVAR(Player,engine_renew_months, SLE_INT16, 16, SL_MAX_VERSION),
@@ -1158,8 +1158,7 @@ static const SaveLoad _player_desc[] = {
SLE_CONDVAR(Player,renew_keep_length, SLE_UINT8, 2, SL_MAX_VERSION), // added with 16.1, but was blank since 2
// reserve extra space in savegame here. (currently 63 bytes)
SLE_CONDARR(NullStruct,null,SLE_FILE_U8 | SLE_VAR_NULL, 7, 2, SL_MAX_VERSION),
SLE_CONDARR(NullStruct,null,SLE_FILE_U64 | SLE_VAR_NULL, 7, 2, SL_MAX_VERSION),
SLE_CONDNULL(63, 2, SL_MAX_VERSION),
SLE_END()
};
@@ -1219,7 +1218,7 @@ static const SaveLoad _player_ai_desc[] = {
SLE_ARR(PlayerAI,order_list_blocks, SLE_UINT8, 20),
SLE_ARR(PlayerAI,banned_tiles, SLE_UINT16, 16),
SLE_CONDARR(NullStruct,null,SLE_FILE_U64 | SLE_VAR_NULL, 8, 2, SL_MAX_VERSION),
SLE_CONDNULL(64, 2, SL_MAX_VERSION),
SLE_END()
};