Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r3235) - Fix: fix two crashes, one with making a screenshot in the main menu without any game loaded, another when failing to load a scenario in 'New Game'

Browse Source
This commit is contained in:
Darkvater 2005-11-26 12:45:53 +00:00
parent 57b4715072
commit af706b9ed3
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openttd.c
View File

@ -778,7 +778,6 @@ void SwitchMode(int new_mode)
case SM_LOAD: { /* Load game, Play Scenario */ case SM_LOAD: { /* Load game, Play Scenario */
_opt_ptr = &_opt; _opt_ptr = &_opt;
_error_message = INVALID_STRING_ID;
if (!SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_NORMAL)) { if (!SafeSaveOrLoad(_file_to_saveload.name, _file_to_saveload.mode, GM_NORMAL)) {
LoadIntroGame(); LoadIntroGame();
ShowErrorMessage(_error_message, STR_4009_GAME_LOAD_FAILED, 0, 0); ShowErrorMessage(_error_message, STR_4009_GAME_LOAD_FAILED, 0, 0);

2
screenshot.c
View File

@ -483,7 +483,7 @@ static char *MakeScreenshotName(const char *ext)
char *base; char *base;
int serial; int serial;
if (_game_mode == GM_EDITOR || _local_player == OWNER_SPECTATOR) { if (_game_mode == GM_EDITOR || _game_mode == GM_MENU || _local_player == OWNER_SPECTATOR) {
sprintf(_screenshot_name, "screenshot"); sprintf(_screenshot_name, "screenshot");
} else { } else {
const Player* p = GetPlayer(_local_player); const Player* p = GetPlayer(_local_player);