MOHAWK: Riven: Add keyboard navigation

1 files changed, 20 insertions, 5 deletions

diff --git a/engines/mohawk/riven_stack.h b/engines/mohawk/riven_stack.h
index 740dff8adc..ce7d2e203d 100644
--- a/engines/mohawk/riven_stack.h
+++ b/engines/mohawk/riven_stack.h
@@ -70,6 +70,20 @@ private:
 	Common::Array<uint16> _index;
 };
 
+/** Actions that can be performed using the keyboard */
+enum RivenKeyAction {
+	kKeyActionNone,
+	kKeyActionSkip,
+	kKeyActionMoveForward,
+	kKeyActionMoveForwardLeft,
+	kKeyActionMoveForwardRight,
+	kKeyActionMoveLeft,
+	kKeyActionMoveRight,
+	kKeyActionMoveBack,
+	kKeyActionLookUp,
+	kKeyActionLookDown
+};
+
 /**
  * A game level
  *
@@ -152,13 +166,13 @@ public:
 	void mouseForceUp();
 
 	/** Handle a key press event */
-	void onKeyPressed(const Common::KeyCode keyCode);
+	void onKeyPressed(const Common::KeyState &keyState);
 
-	/** Get the pressed keyboard key if any */
-	Common::KeyCode keyGetPressed() const;
+	/** Get the action for the pressed keyboard key, if any */
+	RivenKeyAction keyGetAction() const;
 
 	/** Force the keyboard to be considered unpressed until the next key press */
-	void keyForceUp();
+	void keyResetAction();
 
 	// Common external commands
 	void xflies(const ArgumentArray &args); // Start the "flies" effect
@@ -210,7 +224,8 @@ private:
 
 	CommandsMap _commands;
 
-	Common::KeyCode _keyPressed;
+	RivenKeyAction _keyAction;
+	RivenKeyAction mapKeyStateToKeyAction(const Common::KeyState &keyState);
 
 	bool _mouseIsDown;
 	Common::Point _mousePosition;