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

[fracturehill]

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:
2bd6092738 NANCY: Use numpad enter key
a97ee89118 NANCY: Clear generic flags when loading save


Commit: 2bd60927383819fbedd244620a32b6b41e183590
    https://github.com/scummvm/scummvm/commit/2bd60927383819fbedd244620a32b6b41e183590
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2023-11-28T11:50:55+02:00

Commit Message:
NANCY: Use numpad enter key

In places where the engine expects text input, using the
numpad enter key now acts the same as using the return key

Changed paths:
    engines/nancy/action/puzzle/passwordpuzzle.cpp
    engines/nancy/action/puzzle/riddlepuzzle.cpp
    engines/nancy/state/loadsave.cpp


diff --git a/engines/nancy/action/puzzle/passwordpuzzle.cpp b/engines/nancy/action/puzzle/passwordpuzzle.cpp
index d49da545240..d538731ac3d 100644
--- a/engines/nancy/action/puzzle/passwordpuzzle.cpp
+++ b/engines/nancy/action/puzzle/passwordpuzzle.cpp
@@ -211,7 +211,7 @@ void PasswordPuzzle::handleInput(NancyInput &input) {
 
 				drawText();
 			}
-		} else if (key.keycode == Common::KEYCODE_RETURN) {
+		} else if (key.keycode == Common::KEYCODE_RETURN || key.keycode == Common::KEYCODE_KP_ENTER) {
 			_playerHasHitReturn = true;
 		} else if (Common::isAlnum(key.ascii) || Common::isSpace(key.ascii)) {
 			if (activeField.size() && activeField.lastChar() == '-') {
diff --git a/engines/nancy/action/puzzle/riddlepuzzle.cpp b/engines/nancy/action/puzzle/riddlepuzzle.cpp
index c75e17d2d2c..25441773bef 100644
--- a/engines/nancy/action/puzzle/riddlepuzzle.cpp
+++ b/engines/nancy/action/puzzle/riddlepuzzle.cpp
@@ -289,7 +289,7 @@ void RiddlePuzzle::handleInput(NancyInput &input) {
 
 				drawText();
 			}
-		} else if (key.keycode == Common::KEYCODE_RETURN) {
+		} else if (key.keycode == Common::KEYCODE_RETURN || key.keycode == Common::KEYCODE_KP_ENTER) {
 			if (_playerInput.size() == 0 ||
 				(_playerInput.size() == 1 && _playerInput.lastChar() == '-')) {
 					continue;
diff --git a/engines/nancy/state/loadsave.cpp b/engines/nancy/state/loadsave.cpp
index bc365e46e15..7346bbf269c 100644
--- a/engines/nancy/state/loadsave.cpp
+++ b/engines/nancy/state/loadsave.cpp
@@ -419,7 +419,7 @@ void LoadSaveMenu::enterFilename() {
 			if (_enteredString.size()) {
 				_enteredString.deleteLastChar();
 			}
-		} else if (key.keycode == Common::KEYCODE_RETURN) {
+		} else if (key.keycode == Common::KEYCODE_RETURN || key.keycode == Common::KEYCODE_KP_ENTER) {
 			enterKeyPressed = true;
 		} else if (Common::isAlnum(key.ascii) || Common::isSpace(key.ascii)) {
 			_enteredString += key.ascii;


Commit: a97ee891183fab3f5844d8541d5d76ed6df97420
    https://github.com/scummvm/scummvm/commit/a97ee891183fab3f5844d8541d5d76ed6df97420
Author: Kaloyan Chehlarski (strahy at outlook.com)
Date: 2023-11-28T11:50:55+02:00

Commit Message:
NANCY: Clear generic flags when loading save

This fixes some weird behavior in scenes that use the
kSound dependency type. When the player clicks a trigger
that plays a sound, but saves the game while the sound
is being played, that trigger may end up disabled on load,
breaking the game.

Changed paths:
    engines/nancy/state/scene.cpp


diff --git a/engines/nancy/state/scene.cpp b/engines/nancy/state/scene.cpp
index d3eeab0854a..9ae4d156da2 100644
--- a/engines/nancy/state/scene.cpp
+++ b/engines/nancy/state/scene.cpp
@@ -662,6 +662,11 @@ void Scene::synchronize(Common::Serializer &ser) {
 
 	ser.syncArray(_flags.eventFlags.data(), g_nancy->getStaticData().numEventFlags, Common::Serializer::Byte);
 
+	// Clear generic flags
+	for (uint16 id : g_nancy->getStaticData().genericEventFlags) {
+		_flags.eventFlags[id] = g_nancy->_false;
+	}
+
 	// Skip empty sceneCount array
 	ser.skip(2001 * 2, 0, 2);