Skip to content

Commit 517da83

Browse files
SupSuperSupSuper
committed
Durrrr
1 parent 45ee3a6 commit 517da83

7 files changed

Lines changed: 7 additions & 7 deletions

‎src/Menu/AbandonGameState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ AbandonGameState::AbandonGameState(OptionsOrigin origin) : _origin(origin)
5858
_txtTitle = new Text(206, 17, x+5, 70);
5959

6060
// Set palette
61-
setInterface("geoscape", false, _game->getSavedGame()->getSavedBattle());
61+
setInterface("geoscape", false, _game->getSavedGame() ? _game->getSavedGame()->getSavedBattle() : 0);
6262

6363
add(_window, "genericWindow", "geoscape");
6464
add(_btnYes, "genericButton2", "geoscape");

‎src/Menu/ConfirmLoadState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ConfirmLoadState::ConfirmLoadState(OptionsOrigin origin, const std::string &file
4646
_txtText = new Text(204, 58, 58, 60);
4747

4848
// Set palette
49-
setInterface("saveMenus", false, _game->getSavedGame()->getSavedBattle());
49+
setInterface("saveMenus", false, _game->getSavedGame() ? _game->getSavedGame()->getSavedBattle() : 0);
5050

5151
add(_window, "confirmLoad", "saveMenus");
5252
add(_btnYes, "confirmLoad", "saveMenus");

‎src/Menu/DeleteGameState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ DeleteGameState::DeleteGameState(OptionsOrigin origin, const std::string &save)
4949
_txtMessage = new Text(246, 32, 37, 70);
5050

5151
// Set palette
52-
setInterface("saveMenus", false, _game->getSavedGame()->getSavedBattle());
52+
setInterface("saveMenus", false, _game->getSavedGame() ? _game->getSavedGame()->getSavedBattle() : 0);
5353

5454
add(_window, "confirmDelete", "saveMenus");
5555
add(_btnYes, "confirmDelete", "saveMenus");

‎src/Menu/OptionsBaseState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ OptionsBaseState::OptionsBaseState(OptionsOrigin origin) : _origin(origin)
7272
_txtTooltip = new Text(305, 25, 8, 148);
7373

7474
// Set palette
75-
setInterface("optionsMenu", false, _game->getSavedGame()->getSavedBattle());
75+
setInterface("optionsMenu", false, _game->getSavedGame() ? _game->getSavedGame()->getSavedBattle() : 0);
7676

7777
add(_window, "window", "optionsMenu");
7878

‎src/Menu/OptionsConfirmState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ OptionsConfirmState::OptionsConfirmState(OptionsOrigin origin) : _origin(origin)
5151
_timer = new Timer(1000);
5252

5353
// Set palette
54-
setInterface("mainMenu", false, _game->getSavedGame()->getSavedBattle());
54+
setInterface("mainMenu", false, _game->getSavedGame() ? _game->getSavedGame()->getSavedBattle() : 0);
5555

5656
add(_window, "confirmVideo", "mainMenu");
5757
add(_btnYes, "confirmVideo", "mainMenu");

‎src/Menu/OptionsDefaultsState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ OptionsDefaultsState::OptionsDefaultsState(OptionsOrigin origin, OptionsBaseStat
4646
_txtTitle = new Text(246, 32, 37, 70);
4747

4848
// Set palette
49-
setInterface("mainMenu", false, _game->getSavedGame()->getSavedBattle());
49+
setInterface("mainMenu", false, _game->getSavedGame() ? _game->getSavedGame()->getSavedBattle() : 0);
5050

5151
add(_window, "confirmDefaults", "mainMenu");
5252
add(_btnYes, "confirmDefaults", "mainMenu");

‎src/Menu/PauseState.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ PauseState::PauseState(OptionsOrigin origin) : _origin(origin)
6464
_txtTitle = new Text(206, 17, x+5, 32);
6565

6666
// Set palette
67-
setInterface("pauseMenu", false, _game->getSavedGame()->getSavedBattle());
67+
setInterface("pauseMenu", false, _game->getSavedGame() ? _game->getSavedGame()->getSavedBattle() : 0);
6868

6969
add(_window, "window", "pauseMenu");
7070
add(_btnLoad, "button", "pauseMenu");

0 commit comments

Comments
 (0)