[Scummvm-git-logs] scummvm branch-2-1 -> f7e84adca58ad3495e83030b7c43bcefc5020eda

[bluegr]

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

Summary:
7e8bb1b0f8 TOLTECS: Fix spacing
7817718bdf TOLTECS: Stop processing game menus after an RTL event. Fixes #11256
f7e84adca5 NEWS: Mention TOLTECS RTL fix


Commit: 7e8bb1b0f883d3f229a62b4dae6f7e5b695d4d82
    https://github.com/scummvm/scummvm/commit/7e8bb1b0f883d3f229a62b4dae6f7e5b695d4d82
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2020-01-12T22:08:49+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: 7817718bdf6729ed1274357ea01df9389bbfcc2b
    https://github.com/scummvm/scummvm/commit/7817718bdf6729ed1274357ea01df9389bbfcc2b
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2020-01-12T22:08:49+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;


Commit: f7e84adca58ad3495e83030b7c43bcefc5020eda
    https://github.com/scummvm/scummvm/commit/f7e84adca58ad3495e83030b7c43bcefc5020eda
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2020-01-12T22:09:44+02:00

Commit Message:
NEWS: Mention TOLTECS RTL fix

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index 375edb2..e66230a 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -40,6 +40,7 @@ Queen:
 
  Toltecs:
    - Added Czech version support.
+   - Fixed exiting from game menus when returning to the launcher.
 
  Wintermute:
    - Added several missing game variants and demos to the detection tables.