[Scummvm-git-logs] scummvm master -> 9fea5ff073f6a447eb1dfb41b95a371ad9b96539

[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:
4e33d6ad2b PEGASUS: Handle mouse wheel events using the keymapper
9fea5ff073 PEGASUS: Handle custom engine actions in showTempScreen()


Commit: 4e33d6ad2bf8518d2cd46602a340b4531ff056d7
    https://github.com/scummvm/scummvm/commit/4e33d6ad2bf8518d2cd46602a340b4531ff056d7
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-04-19T03:13:11+03:00

Commit Message:
PEGASUS: Handle mouse wheel events using the keymapper

Changed paths:
    engines/pegasus/input.cpp
    engines/pegasus/pegasus.cpp


diff --git a/engines/pegasus/input.cpp b/engines/pegasus/input.cpp
index 471f1c5918..d7d99d1e65 100644
--- a/engines/pegasus/input.cpp
+++ b/engines/pegasus/input.cpp
@@ -63,18 +63,8 @@ void InputDeviceManager::getInput(Input &input, const InputBits filter) {
 	InputBits currentBits = 0;
 
 	Common::Event event;
-	while (g_system->getEventManager()->pollEvent(event)) {
-		switch (event.type) {
-			case Common::EVENT_WHEELUP:
-				currentBits |= (kRawButtonDown << kUpButtonShift);
-				break;
-			case Common::EVENT_WHEELDOWN:
-				currentBits |= (kRawButtonDown << kDownButtonShift);
-				break;
-			default:
-				break;
-		}
-	}
+	while (g_system->getEventManager()->pollEvent(event))
+		;
 
 	// Now fill in the rest of the bitfield
 	if (_keysDown[kPegasusActionUp])
diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp
index 1ea22f7571..7925de29c6 100644
--- a/engines/pegasus/pegasus.cpp
+++ b/engines/pegasus/pegasus.cpp
@@ -2713,6 +2713,7 @@ Common::KeymapArray PegasusEngine::initKeymaps() {
 	act->addDefaultInputMapping("UP");
 	act->addDefaultInputMapping("KP8");
 	act->addDefaultInputMapping("JOY_UP");
+	act->addDefaultInputMapping("MOUSE_WHEEL_UP");
 	engineKeyMap->addAction(act);
 
 	act = new Action(kStandardActionMoveDown, _("Down/Zoom Out"));
@@ -2720,6 +2721,7 @@ Common::KeymapArray PegasusEngine::initKeymaps() {
 	act->addDefaultInputMapping("DOWN");
 	act->addDefaultInputMapping("KP5");
 	act->addDefaultInputMapping("JOY_DOWN");
+	act->addDefaultInputMapping("MOUSE_WHEEL_DOWN");
 	engineKeyMap->addAction(act);
 
 	act = new Action(kStandardActionMoveLeft, _("Turn Left"));


Commit: 9fea5ff073f6a447eb1dfb41b95a371ad9b96539
    https://github.com/scummvm/scummvm/commit/9fea5ff073f6a447eb1dfb41b95a371ad9b96539
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-04-19T03:13:11+03:00

Commit Message:
PEGASUS: Handle custom engine actions in showTempScreen()

Changed paths:
    engines/pegasus/pegasus.cpp


diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp
index 7925de29c6..f236f2f5d2 100644
--- a/engines/pegasus/pegasus.cpp
+++ b/engines/pegasus/pegasus.cpp
@@ -1431,6 +1431,7 @@ void PegasusEngine::showTempScreen(const Common::String &fileName) {
 			case Common::EVENT_RBUTTONUP:
 			case Common::EVENT_KEYDOWN:
 			case Common::EVENT_JOYBUTTON_DOWN:
+			case Common::EVENT_CUSTOM_ENGINE_ACTION_START:
 				done = true;
 				break;
 			default: