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

Merge branch 'cpp-11' into save_ext

Browse Source 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
This commit is contained in:
Jonathan G Rennison
2019-02-04 18:24:38 +00:00
parent 02e2627765 09c62d6951
commit 46b5b0155c
280 changed files with 11624 additions and 3855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/settings.cpp
View File

@@ -1100,7 +1100,7 @@ static bool InvalidateNewGRFChangeWindows(int32 p1)
static bool InvalidateCompanyLiveryWindow(int32 p1)
{
InvalidateWindowClassesData(WC_COMPANY_COLOUR);
InvalidateWindowClassesData(WC_COMPANY_COLOUR, -1);
return RedrawScreen(p1);
}
@@ -1179,6 +1179,7 @@ static bool MaxNoAIsChange(int32 i)
ShowErrorMessage(STR_WARNING_NO_SUITABLE_AI, INVALID_STRING_ID, WL_CRITICAL);
}
InvalidateWindowClassesData(WC_GAME_OPTIONS, 0);
return true;
}
@@ -1381,7 +1382,7 @@ static void PrepareOldDiffCustom()
*/
static void HandleOldDiffCustom(bool savegame)
{
uint options_to_load = GAME_DIFFICULTY_NUM - ((savegame && IsSavegameVersionBefore(4)) ? 1 : 0);
uint options_to_load = GAME_DIFFICULTY_NUM - ((savegame && IsSavegameVersionBefore(SLV_4)) ? 1 : 0);
if (!savegame) {
/* If we did read to old_diff_custom, then at least one value must be non 0. */
@@ -2229,7 +2230,7 @@ static void LoadSettingsXref(const SettingDesc *osd, void *object) {
*/
static void LoadSettings(const SettingDesc *osd, void *object)
{
extern uint16 _sl_version;
extern SaveLoadVersion _sl_version;
for (; osd->save.cmd != SL_END; osd++) {
if (osd->patx_name != NULL) continue;