ACCESS: Cleaned up event handling for scene establish text display

scummvm · Dec 13, 2014 · a1e5e8b · a1e5e8b
1 parent 40b8417
commit a1e5e8b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/engines/access/access.cpp b/engines/access/access.cpp
@@ -196,7 +196,7 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 	int curPage = 0;
 	int soundsLeft = 0;
 
-	for (;;) {
+	while (!shouldQuit()) {
 		soundsLeft = _countTbl[curPage];
 		_events->zeroKeys();
 
@@ -216,7 +216,7 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 			if (!_sound->_isVoice) {
 				_events->waitKeyMouse();
 			} else {
-				for (;;) {
+				while (!shouldQuit()) {
 					_sound->freeSounds();
 					Resource *sound = _sound->loadSound(_narateFile + 99, _sndSubFile);
 					_sound->_soundTable.push_back(SoundEntry(sound, 1));
@@ -225,11 +225,7 @@ void AccessEngine::speakText(ASurface *s, const Common::String &msg) {
 
 					_events->pollEvents();
 
-					if (_events->_leftButton) {
-						_events->debounceLeft();
-						_sndSubFile += soundsLeft;
-						break;
-					} else if (_events->isKeyPending()) {
+					if (_events->isKeyMousePressed()) {
 						_sndSubFile += soundsLeft;
 						break;
 					} else {

diff --git a/engines/access/amazon/amazon_game.cpp b/engines/access/amazon/amazon_game.cpp
@@ -201,6 +201,7 @@ void AmazonEngine::loadEstablish(int estabIndex) {
 void AmazonEngine::doEstablish(int screenId, int estabIndex) {
 	_establishMode = 1;
 
+	_events->clearEvents();
 	_screen->forceFadeOut();
 	_screen->clearScreen();
 	_screen->setPanel(3);

diff --git a/engines/access/events.cpp b/engines/access/events.cpp
@@ -299,7 +299,7 @@ void EventsManager::clearEvents() {
 }
 
 void EventsManager::waitKeyMouse() {
-	while (!_vm->shouldQuit() && isKeyMousePressed()) {
+	while (!_vm->shouldQuit() && !isKeyMousePressed()) {
 		pollEvents(true);
 		g_system->delayMillis(10);
 	}