dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r24810) -Fix: Make engine preview offers more robust wrt. changes in the company ranking.

Browse Source
This commit is contained in:
frosch
2012-12-09 16:55:03 +00:00
parent 69b09ddb0b
commit 9f0e8399b0
6 changed files with 52 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/saveload/engine_sl.cpp
View File

@@ -30,7 +30,9 @@ static const SaveLoad _engine_desc[] = {
SLE_CONDNULL(1, 0, 120),
SLE_VAR(Engine, flags, SLE_UINT8),
SLE_VAR(Engine, preview_company_rank,SLE_UINT8),
SLE_CONDNULL(1, 0, 178), // old preview_company_rank
SLE_CONDVAR(Engine, preview_asked, SLE_UINT16, 179, SL_MAX_VERSION),
SLE_CONDVAR(Engine, preview_company, SLE_UINT8, 179, SL_MAX_VERSION),
SLE_VAR(Engine, preview_wait, SLE_UINT8),
SLE_CONDNULL(1, 0, 44),
SLE_CONDVAR(Engine, company_avail, SLE_FILE_U8 | SLE_VAR_U16, 0, 103),
@@ -67,6 +69,14 @@ static void Load_ENGN()
while ((index = SlIterateArray()) != -1) {
Engine *e = GetTempDataEngine(index);
SlObject(e, _engine_desc);
if (IsSavegameVersionBefore(179)) {
/* preview_company_rank was replaced with preview_company and preview_asked.
* Just cancel any previews. */
e->flags &= ~4; // ENGINE_OFFER_WINDOW_OPEN
e->preview_company = INVALID_COMPANY;
e->preview_asked = (CompanyMask)-1;
}
}
}
@@ -91,7 +101,8 @@ void CopyTempEngineData()
e->duration_phase_2 = se->duration_phase_2;
e->duration_phase_3 = se->duration_phase_3;
e->flags = se->flags;
e->preview_company_rank= se->preview_company_rank;
e->preview_asked = se->preview_asked;
e->preview_company = se->preview_company;
e->preview_wait = se->preview_wait;
e->company_avail = se->company_avail;
if (se->name != NULL) e->name = strdup(se->name);

5
src/saveload/oldloader_sl.cpp
View File

@@ -445,7 +445,8 @@ static bool FixTTOEngines()
e->info.climates = 1;
}
e->preview_company_rank = 0;
e->preview_company = INVALID_COMPANY;
e->preview_asked = (CompanyMask)-1;
e->preview_wait = 0;
e->name = NULL;
}
@@ -1401,7 +1402,7 @@ static const OldChunks engine_chunk[] = {
OCL_NULL( 1 ), // lifelength
OCL_SVAR( OC_UINT8, Engine, flags ),
OCL_SVAR( OC_UINT8, Engine, preview_company_rank ),
OCL_NULL( 1 ), // preview_company_rank
OCL_SVAR( OC_UINT8, Engine, preview_wait ),
OCL_CNULL( OC_TTD, 2 ), ///< railtype + junk

3
src/saveload/saveload.cpp
View File

@@ -242,8 +242,9 @@
* 176 24446
* 177 24619
* 178 24789
* 179 24810
*/
extern const uint16 SAVEGAME_VERSION = 178; ///< Current savegame version of OpenTTD.
extern const uint16 SAVEGAME_VERSION = 179; ///< Current savegame version of OpenTTD.
SavegameType _savegame_type; ///< type of savegame we are loading