[Scummvm-cvs-logs] scummvm master -> da1b76be4d7fd477ba75ca8b04a961d7ab7cd0ef

[urukgit]

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:
da1b76be4d Revert "CGE2: Make the intro skippable."


Commit: da1b76be4d7fd477ba75ca8b04a961d7ab7cd0ef
    https://github.com/scummvm/scummvm/commit/da1b76be4d7fd477ba75ca8b04a961d7ab7cd0ef
Author: Peter Bozsó (koppirnyo at gmail.com)
Date: 2014-09-07T10:45:29+02:00

Commit Message:
Revert "CGE2: Make the intro skippable."

This reverts commit 5e099e90bcdfb87c289b919ddac60e60fbf6bdd7.
There's no need for this addition, since the intro was skippable before that too, by hitting the ESC key.
See System::touch().

Changed paths:
    engines/cge2/cge2.cpp
    engines/cge2/cge2.h
    engines/cge2/cge2_main.cpp
    engines/cge2/events.cpp



diff --git a/engines/cge2/cge2.cpp b/engines/cge2/cge2.cpp
index 8e70f0e..8b51dda 100644
--- a/engines/cge2/cge2.cpp
+++ b/engines/cge2/cge2.cpp
@@ -76,7 +76,6 @@ CGE2Engine::CGE2Engine(OSystem *syst, const ADGameDescription *gameDescription)
 		_vol[i] = nullptr;
 	_eventManager = nullptr;
 	_map = nullptr;
-	_skipIntro = false;
 	_quitFlag = false;
 	_bitmapPalette = nullptr;
 	_startupMode = 1;
diff --git a/engines/cge2/cge2.h b/engines/cge2/cge2.h
index 79cb206..8e94683 100644
--- a/engines/cge2/cge2.h
+++ b/engines/cge2/cge2.h
@@ -280,7 +280,6 @@ public:
 
 	Common::RandomSource _randomSource;
 
-	bool _skipIntro;
 	bool _quitFlag;
 	Dac *_bitmapPalette;
 	int _startupMode;
diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp
index 3a994dd..c52a354 100644
--- a/engines/cge2/cge2_main.cpp
+++ b/engines/cge2/cge2_main.cpp
@@ -396,7 +396,7 @@ void CGE2Engine::movie(const char *ext) {
 		sceneUp(_now);
 		_keyboard->setClient(_sys);
 
-		while (!_commandHandler->idle() && !_quitFlag && !_skipIntro)
+		while (!_commandHandler->idle() && !_quitFlag)
 			mainLoop();
 
 		_keyboard->setClient(nullptr);
@@ -532,11 +532,11 @@ void CGE2Engine::mainLoop() {
 	// Handle a delay between game frames
 	handleFrame();
 
-	// Check shouldQuit()
-	_quitFlag = shouldQuit();
-
 	// Handle any pending events
 	_eventManager->poll();
+
+	// Check shouldQuit()
+	_quitFlag = shouldQuit();
 }
 
 void CGE2Engine::checkSounds() {
diff --git a/engines/cge2/events.cpp b/engines/cge2/events.cpp
index 13f6b4d..ed1ec66 100644
--- a/engines/cge2/events.cpp
+++ b/engines/cge2/events.cpp
@@ -219,8 +219,6 @@ void EventManager::poll() {
 		switch (_event.type) {
 		case Common::EVENT_KEYDOWN:
 		case Common::EVENT_KEYUP:
-			if (_vm->_startupMode == 1)
-				_vm->_skipIntro = true; // So the player can interrupt the intro.
 			// Handle keyboard events
 			_vm->_keyboard->newKeyboard(_event);
 			handleEvents();