0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix not being able to load a game from within a game

Browse source 
Every time an attempt was made, the titlescreen got in the way.
This commit is contained in:
Charles Dang 2016-09-11 00:18:24 +11:00
parent eaf5ef96ed
commit 54e879b183
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/wesnoth.cpp
View file

@ -752,16 +752,25 @@ static int do_gameloop(const std::vector<std::string>& args)
return 0;
}
preferences::load_hotkeys();
const font::floating_label_context label_manager;
cursor::set(cursor::NORMAL);
gui2::ttitle_screen::tresult res = gui2::ttitle_screen::display(*game);
game_launcher::RELOAD_GAME_DATA should_reload =
game_launcher::RELOAD_DATA;
game_launcher::RELOAD_GAME_DATA should_reload = game_launcher::RELOAD_DATA;
// If loading a game, skip the titlescreen entirely
if(game->is_loading()) {
if(!game->load_game()) {
game->clear_loaded_game();
}
game->launch_game(should_reload);
continue;
}
gui2::ttitle_screen::tresult res = gui2::ttitle_screen::display(*game);
switch(res) {
case gui2::ttitle_screen::QUIT_GAME: