ACCESS: Fix the end of the demo

scummvm · Dec 13, 2014 · b864b84 · b864b84
1 parent bf36171
commit b864b84
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
@@ -621,22 +621,28 @@ void AmazonEngine::dead(int deathId) {
 	_screen->clearScreen();
 	_screen->setPanel(3);
 
-	if (deathId != 10) {
+	if ((deathId == 10) && !isDemo()) {
+		quitGame();
+		_events->pollEvents();
+		return;
+	} else {
 		if (!isDemo())
 			_midi->newMusic(62, 0);
 		_files->_setPaletteFlag = false;
 		_files->loadScreen(94, 0);
 		_files->_setPaletteFlag = true;
 		_buffer2.copyFrom(*_screen);
 
-		for (int i = 0; i < 3; ++i) {
-			_sound->playSound(0);
-			_screen->forceFadeIn();
-			_sound->playSound(0);
-			_screen->forceFadeOut();
+		if (!isDemo() || deathId != 10) {
+			for (int i = 0; i < 3; ++i) {
+				_sound->playSound(0);
+				_screen->forceFadeIn();
+				_sound->playSound(0);
+				_screen->forceFadeOut();
 
-			if (shouldQuit())
-				return;
+				if (shouldQuit())
+					return;
+			}
 		}
 
 		if (!isDemo()) {
@@ -708,9 +714,6 @@ void AmazonEngine::dead(int deathId) {
 		warning("TODO: restart game");
 		quitGame();
 		_events->pollEvents();
-	} else {
-		quitGame();
-		_events->pollEvents();
 	}
 }