Fix loadscreen progressbar "bleeding" on the old MP lobby...

...when running with -s switch

This fixes the more general case and invokes loadscreen_manager.reset()
earlier in the sequence right before attempting to jump into gameplay.
This commit is contained in:
Ignacio R. Morelle 2011-02-19 22:26:44 +00:00
parent bfd2176ecd
commit 9d48c92650
2 changed files with 4 additions and 2 deletions

View file

@ -20,6 +20,8 @@ Version 1.9.4+svn:
instead of the keyboard focus.
* Fixed again: Not showing the twml_exception dialog when gui2 was called
from Lua (bug #17405).
* Fix old multiplayer lobby glitches caused by the loadscreen code when
skipping to the lobby with -s <server> command line.
* WML engine:
* Allow [color_range] and [color_palette] nodes to be inserted at top-level
by add-ons to globally define custom ranges and palettes.

View file

@ -2278,6 +2278,8 @@ static int do_gameloop(int argc, char** argv)
}
}
loadscreen_manager.reset();
if(game.play_test() == false) {
return 0;
}
@ -2310,8 +2312,6 @@ static int do_gameloop(int argc, char** argv)
return 0;
}
loadscreen_manager.reset();
gui2::ttitle_screen::tresult res = game.is_loading()
? gui2::ttitle_screen::LOAD_GAME
: gui2::ttitle_screen::NOTHING;