[Scummvm-cvs-logs] scummvm master -> f055512f1758c4a5a5d73cd1a533e4c2329a190b
Strangerke
Strangerke at scummvm.org
Tue May 28 08:23:40 CEST 2013
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:
f055512f17 HOPKINS: Fix crash in Polish demo - Bug #3613954
Commit: f055512f1758c4a5a5d73cd1a533e4c2329a190b
https://github.com/scummvm/scummvm/commit/f055512f1758c4a5a5d73cd1a533e4c2329a190b
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-05-27T23:21:59-07:00
Commit Message:
HOPKINS: Fix crash in Polish demo - Bug #3613954
Changed paths:
engines/hopkins/hopkins.cpp
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 11d60c5..b023a2f 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -402,14 +402,27 @@ bool HopkinsEngine::runWin95Demo() {
break;
case 151:
- _soundMan->playSound(28);
- _globals->_eventMode = EVENTMODE_ALT; // CHECKME!
- _graphicsMan->clearScreen();
- _graphicsMan->clearPalette();
- _graphicsMan->loadImage("njour3a");
- _graphicsMan->fadeInLong();
- _events->delay(5000);
- _graphicsMan->fadeOutLong();
+ if (_fileIO->fileExists("JOUR3A.ANM")) {
+ // The Polish demo uses the animation file than the complete versions
+ _soundMan->playSound(16);
+ _globals->_eventMode = EVENTMODE_IGNORE;
+
+ _graphicsMan->clearScreen();
+ _graphicsMan->clearPalette();
+ _graphicsMan->_fadingFl = true;
+ _animMan->playAnim("JOUR3A.ANM", "JOUR3A.ANM", 12, 12, 2000);
+ } else {
+ // The other demos only display a nag screen
+ _soundMan->playSound(28);
+ _globals->_eventMode = EVENTMODE_ALT; // CHECKME!
+ _graphicsMan->clearScreen();
+ _graphicsMan->clearPalette();
+ _graphicsMan->loadImage("njour3a");
+ _graphicsMan->fadeInLong();
+ _events->delay(5000);
+ _graphicsMan->fadeOutLong();
+ }
+
_globals->_exitId = 300;
_globals->_eventMode = EVENTMODE_DEFAULT;
break;
More information about the Scummvm-git-logs
mailing list