[Scummvm-git-logs] scummvm master -> db4709510aa13505ff37bd929ba278dbcbc83bbe

[bluegr]

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

Summary:
ba569cb331 TOLTECS: Fix spacing
db4709510a TOLTECS: Stop processing game menus after an RTL event. Fixes #11256


Commit: ba569cb3310eb74db9e378e415f1aea5859200c6
    https://github.com/scummvm/scummvm/commit/ba569cb3310eb74db9e378e415f1aea5859200c6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2020-01-12T21:54:15+02:00

Commit Message:
TOLTECS: Fix spacing

Changed paths:
    engines/toltecs/toltecs.cpp


diff --git a/engines/toltecs/toltecs.cpp b/engines/toltecs/toltecs.cpp
index 5ec3595..2eebe91 100644
--- a/engines/toltecs/toltecs.cpp
+++ b/engines/toltecs/toltecs.cpp
@@ -316,7 +316,7 @@ void ToltecsEngine::updateInput() {
 	Common::Event event;
 	Common::EventManager *eventMan = _system->getEventManager();
 	while (eventMan->pollEvent(event)) {
-	switch (event.type) {
+		switch (event.type) {
 		case Common::EVENT_KEYDOWN:
 			_keyState = event.kbd;
 
@@ -374,8 +374,8 @@ void ToltecsEngine::updateInput() {
 			break;
 		default:
 			break;
-		}
-	}
+		}	// switch
+	}	// while
 
 	if (!_mouseDisabled) {
 


Commit: db4709510aa13505ff37bd929ba278dbcbc83bbe
    https://github.com/scummvm/scummvm/commit/db4709510aa13505ff37bd929ba278dbcbc83bbe
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2020-01-12T21:54:15+02:00

Commit Message:
TOLTECS: Stop processing game menus after an RTL event. Fixes #11256

Changed paths:
    engines/toltecs/menu.cpp


diff --git a/engines/toltecs/menu.cpp b/engines/toltecs/menu.cpp
index c437326..b5e35f8 100644
--- a/engines/toltecs/menu.cpp
+++ b/engines/toltecs/menu.cpp
@@ -124,6 +124,7 @@ void MenuSystem::handleEvents() {
 		case Common::EVENT_KEYDOWN:
 			handleKeyDown(event.kbd);
 			break;
+		case Common::EVENT_RTL:
 		case Common::EVENT_QUIT:
 			_running = false;
 			break;