[Scummvm-git-logs] scummvm branch-2-2 -> c617314fd637f5663b6149d3a818b0fe98ee9c85

[dreammaster]

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:
8278153f82 NEWS: Added 2.2.1 section for cherry-picked commits
c617314fd6 XEEN: Allow for screenshots in cutscenes


Commit: 8278153f8287acac6daa33ce7d73821273568869
    https://github.com/scummvm/scummvm/commit/8278153f8287acac6daa33ce7d73821273568869
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-10-08T20:29:38-07:00

Commit Message:
NEWS: Added 2.2.1 section for cherry-picked commits

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index eaa89af5b6..2e116eb999 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,6 +1,22 @@
 For a more comprehensive changelog of the latest experimental code, see:
         https://github.com/scummvm/scummvm/commits/
 
+#### 2.2.1 (XXXX-XX-XX)
+
+ Glk:
+   - Fix savegame issues with several subengines.
+   - Fix memory overrun in Level9 game detector.
+
+ Lure:
+   - Fix fire animation in first room when loading saves.
+
+ Ultima:
+   - Ultima 4: Added several debugger commands.
+   - Ultima 4: Allow Enter key to exit ZStats display.
+
+ Xeen:
+   - Fixed occasional border corruption during fights.
+
 #### 2.2.0 "Interactive Fantasy" (2020-09-27)
 
  New games:


Commit: c617314fd637f5663b6149d3a818b0fe98ee9c85
    https://github.com/scummvm/scummvm/commit/c617314fd637f5663b6149d3a818b0fe98ee9c85
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-10-08T20:29:38-07:00

Commit Message:
XEEN: Allow for screenshots in cutscenes

Changed paths:
    NEWS.md
    engines/xeen/events.cpp
    engines/xeen/events.h


diff --git a/NEWS.md b/NEWS.md
index 2e116eb999..1fb39455c2 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -16,6 +16,7 @@ For a more comprehensive changelog of the latest experimental code, see:
 
  Xeen:
    - Fixed occasional border corruption during fights.
+   - Improvements to cutscenes to better match the original games.
 
 #### 2.2.0 "Interactive Fantasy" (2020-09-27)
 
diff --git a/engines/xeen/events.cpp b/engines/xeen/events.cpp
index d61782556d..46caccd3e8 100644
--- a/engines/xeen/events.cpp
+++ b/engines/xeen/events.cpp
@@ -84,7 +84,8 @@ void EventsManager::pollEvents() {
 		case Common::EVENT_RETURN_TO_LAUNCHER:
 			return;
 		case Common::EVENT_KEYDOWN:
-			addEvent(event.kbd);
+			if (!isModifierKey(event.kbd.keycode))
+				addEvent(event.kbd);
 			break;
 		case Common::EVENT_MOUSEMOVE:
 			_mousePos = event.mouse;
@@ -207,4 +208,13 @@ void EventsManager::nextFrame() {
 	_vm->_screen->update();
 }
 
+bool EventsManager::isModifierKey(const Common::KeyCode &keycode) const {
+	return keycode == Common::KEYCODE_LCTRL || keycode == Common::KEYCODE_LALT
+		|| keycode == Common::KEYCODE_RCTRL || keycode == Common::KEYCODE_RALT
+		|| keycode == Common::KEYCODE_LSHIFT || keycode == Common::KEYCODE_RSHIFT
+		|| keycode == Common::KEYCODE_LSUPER || keycode == Common::KEYCODE_RSUPER
+		|| keycode == Common::KEYCODE_CAPSLOCK || keycode == Common::KEYCODE_NUMLOCK
+		|| keycode == Common::KEYCODE_SCROLLOCK;
+}
+
 } // End of namespace Xeen
diff --git a/engines/xeen/events.h b/engines/xeen/events.h
index 9913b2fbf1..d2665092a8 100644
--- a/engines/xeen/events.h
+++ b/engines/xeen/events.h
@@ -74,6 +74,11 @@ private:
 	 * Handles moving to the next game frame
 	 */
 	void nextFrame();
+
+	/**
+	 * Returns whether the keypress is a modifier key like Ctrl or Alt
+	 */
+	bool isModifierKey(const Common::KeyCode &keycode) const;
 public:
 	Common::Point _mousePos;
 public: