mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-23 11:04:44 +00:00
Fixed loading of saved games
svn-id: r47729
This commit is contained in:
parent
3d1a43bc54
commit
4a4b69dbeb
@ -951,8 +951,7 @@ EngineState *gamestate_restore(EngineState *s, Common::SeekableReadStream *fh) {
|
||||
|
||||
#ifdef ENABLE_SCI32
|
||||
// Copy the Gui32 pointer over to the new EngineState, if it exists
|
||||
if (s->_gui32)
|
||||
retval->_gui32 = s->_gui32;
|
||||
retval->_gui32 = s->_gui32;
|
||||
#endif
|
||||
|
||||
// Copy some old data
|
||||
|
@ -1043,6 +1043,7 @@ void run_vm(EngineState *s, int restoring) {
|
||||
// place (i.e. menus have been constructed etc). Therefore, inject a kRestoreGame call
|
||||
// here, instead of the requested function.
|
||||
int saveSlot = g_loadFromLauncher;
|
||||
g_loadFromLauncher = -1; // invalidate slot, so that we don't load again
|
||||
|
||||
if (saveSlot < 0)
|
||||
error("Requested to load invalid save slot"); // should never happen, really
|
||||
|
Loading…
x
Reference in New Issue
Block a user