mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r26634) -Fix: 'Load' button was not properly enabled/disabled for old savegames without NewGRF information.

This commit is contained in:
frosch 2014-06-08 15:49:54 +00:00
parent e9e812ccc8
commit 7ab5a99e37
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/fios_gui.cpp
View File

@ -535,7 +535,7 @@ public:
if (_saveload_mode == SLD_LOAD_HEIGHTMAP) { if (_saveload_mode == SLD_LOAD_HEIGHTMAP) {
delete this; delete this;
ShowHeightmapLoad(); ShowHeightmapLoad();
} else if (_load_check_data.grf_compatibility != GLC_NOT_FOUND || _settings_client.gui.UserIsAllowedToChangeNewGRFs()) { } else if (!_load_check_data.HasNewGrfs() || _load_check_data.grf_compatibility != GLC_NOT_FOUND || _settings_client.gui.UserIsAllowedToChangeNewGRFs()) {
_switch_mode = (_game_mode == GM_EDITOR) ? SM_LOAD_SCENARIO : SM_LOAD_GAME; _switch_mode = (_game_mode == GM_EDITOR) ? SM_LOAD_SCENARIO : SM_LOAD_GAME;
ClearErrorMessages(); ClearErrorMessages();
delete this; delete this;
@ -552,7 +552,7 @@ public:
case WID_SL_MISSING_NEWGRFS: case WID_SL_MISSING_NEWGRFS:
if (!_network_available) { if (!_network_available) {
ShowErrorMessage(STR_NETWORK_ERROR_NOTAVAILABLE, INVALID_STRING_ID, WL_ERROR); ShowErrorMessage(STR_NETWORK_ERROR_NOTAVAILABLE, INVALID_STRING_ID, WL_ERROR);
} else { } else if (_load_check_data.HasNewGrfs()) {
#if defined(ENABLE_NETWORK) #if defined(ENABLE_NETWORK)
ShowMissingContentWindow(_load_check_data.grfconfig); ShowMissingContentWindow(_load_check_data.grfconfig);
#endif #endif
@ -693,7 +693,7 @@ public:
} }
if (_saveload_mode == SLD_LOAD_GAME || _saveload_mode == SLD_LOAD_SCENARIO) { if (_saveload_mode == SLD_LOAD_GAME || _saveload_mode == SLD_LOAD_SCENARIO) {
this->SetWidgetDisabledState(WID_SL_LOAD_BUTTON, this->SetWidgetDisabledState(WID_SL_LOAD_BUTTON,
this->selected == NULL || _load_check_data.HasErrors() || !(_load_check_data.grf_compatibility != GLC_NOT_FOUND || _settings_client.gui.UserIsAllowedToChangeNewGRFs())); this->selected == NULL || _load_check_data.HasErrors() || !(!_load_check_data.HasNewGrfs() || _load_check_data.grf_compatibility != GLC_NOT_FOUND || _settings_client.gui.UserIsAllowedToChangeNewGRFs()));
this->SetWidgetDisabledState(WID_SL_NEWGRF_INFO, this->SetWidgetDisabledState(WID_SL_NEWGRF_INFO,
!_load_check_data.HasNewGrfs()); !_load_check_data.HasNewGrfs());
this->SetWidgetDisabledState(WID_SL_MISSING_NEWGRFS, this->SetWidgetDisabledState(WID_SL_MISSING_NEWGRFS,