[Scummvm-cvs-logs] scummvm master -> 3a23991a1846feed5cafe98ced82fe808ee3336d

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
3a23991a18 HOPKINS: Fix bug #3613819 - Crash when loading a savegame in Win95 Demo


Commit: 3a23991a1846feed5cafe98ced82fe808ee3336d
    https://github.com/scummvm/scummvm/commit/3a23991a1846feed5cafe98ced82fe808ee3336d
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-05-26T10:32:40-07:00

Commit Message:
HOPKINS: Fix bug #3613819 - Crash when loading a savegame in Win95 Demo

Changed paths:
    engines/hopkins/hopkins.cpp



diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 2997320..11d60c5 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;