aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2013-05-25 17:05:37 +0200
committerStrangerke2013-05-26 19:32:40 +0200
commit3a23991a1846feed5cafe98ced82fe808ee3336d (patch)
tree4b7f0efd1bd87e1c0d0ec337157f782876e96354
parent718db9f3dfd9779195c94ea07a85bfebc38397fa (diff)
downloadscummvm-rg350-3a23991a1846feed5cafe98ced82fe808ee3336d.tar.gz
scummvm-rg350-3a23991a1846feed5cafe98ced82fe808ee3336d.tar.bz2
scummvm-rg350-3a23991a1846feed5cafe98ced82fe808ee3336d.zip
HOPKINS: Fix bug #3613819 - Crash when loading a savegame in Win95 Demo
-rw-r--r--engines/hopkins/hopkins.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 2997320ba4..11d60c50c6 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -168,24 +168,24 @@ bool HopkinsEngine::runWin95Demo() {
if (_events->_rateCounter > 700)
_globals->_speed = 3;
- if (_startGameSlot == -1) {
+ if (_startGameSlot == -1)
_graphicsMan->fadeOutLong();
- _globals->_eventMode = EVENTMODE_IGNORE;
- _globals->_characterSpriteBuf = _fileIO->loadFile("PERSO.SPR");
- }
+
+ _globals->_eventMode = EVENTMODE_IGNORE;
+ _globals->_characterSpriteBuf = _fileIO->loadFile("PERSO.SPR");
_globals->_characterType = CHARACTER_HOPKINS;
_objectsMan->_mapCarPosX = _objectsMan->_mapCarPosY = 0;
memset(_globals->_saveData, 0, 2000);
_globals->_exitId = 0;
- if (_startGameSlot != -1)
- _saveLoad->loadGame(_startGameSlot);
-
if (getLanguage() != Common::PL_POL)
if (!displayAdultDisclaimer())
return Common::kNoError;
+ if (_startGameSlot != -1)
+ _saveLoad->loadGame(_startGameSlot);
+
for (;;) {
if (_globals->_exitId == 300)
_globals->_exitId = 0;