libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-29 14:42:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GUI: fix bug #2822778

Browse Source 
(Savegames now get loaded after GMM dialogue execution. This avoids mouse cursor glitches (e.g. mouse cursors which get changed during loadGameState() being popped when the dialogue closes).
This commit is contained in:
athrxx 2011-06-25 15:41:58 +02:00
parent 5a2bc12f26
commit 1a05efa8ed
3 changed files with 39 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/dialogs.cpp
View File

@ -246,14 +246,10 @@ void MainMenuDialog::load() {
int slot = _loadDialog->runModalWithPluginAndTarget(plugin, ConfMan.getActiveDomainName());
if (slot >= 0) {
// FIXME: For now we just ignore the return
// value, which is quite bad since it could
// be a fatal loading error, which renders
// the engine unusable.
_engine->loadGameState(slot);
_engine->setGameToLoadSlot(slot);
if (slot >= 0)
close();
}
}
enum {

20
engines/engine.cpp
View File

@ -96,6 +96,7 @@ Engine::Engine(OSystem *syst)
_targetName(ConfMan.getActiveDomainName()),
_pauseLevel(0),
_pauseStartTime(0),
_saveSlotToLoad(-1),
_engineStartTime(_system->getMillis()),
_mainMenuDialog(NULL) {
@ -396,7 +397,22 @@ void Engine::pauseEngineIntern(bool pause) {
void Engine::openMainMenuDialog() {
if (!_mainMenuDialog)
_mainMenuDialog = new MainMenuDialog(this);
setGameToLoadSlot(-1);
runDialog(*_mainMenuDialog);
// Load savegame after main menu execution
// (not from inside the menu loop to avoid
// mouse cursor glitches and simliar bugs,
// e.g. #2822778).
// FIXME: For now we just ignore the return
// value, which is quite bad since it could
// be a fatal loading error, which renders
// the engine unusable.
if (_saveSlotToLoad > 0)
loadGameState(_saveSlotToLoad);
syncSoundSettings();
}
@ -437,6 +453,10 @@ int Engine::runDialog(GUI::Dialog &dialog) {
return result;
}
void Engine::setGameToLoadSlot(int slot) {
_saveSlotToLoad = slot;
}
void Engine::syncSoundSettings() {
// Sync the engine with the config manager
int soundVolumeMusic = ConfMan.getInt("music_volume");

16
engines/engine.h
View File

@ -82,6 +82,13 @@ private:
*/
int32 _engineStartTime;
/**
* Save slot selected via global main menu.
* This slot will be loaded after main menu execution (not from inside
* the menu loop, to avoid bugs like #2822778).
*/
int _saveSlotToLoad;
public:
@ -185,6 +192,15 @@ public:
*/
virtual Common::Error loadGameState(int slot);
/**
* Sets the game slot for a savegame to be loaded after global
* main menu execution. This is to avoid loading a savegame from
* inside the menu loop which causes bugs like #2822778.
*
* @param slot the slot from which a savestate should be loaded.
*/
void setGameToLoadSlot(int slot);
/**
* Indicates whether a game state can be loaded.
*/