aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruruk2013-07-30 22:25:04 +0200
committeruruk2013-07-30 22:25:04 +0200
commit6ffcb714af5f446826b0c029ebcaed222291e961 (patch)
treefa7e87f77f81fbbc1810bd877ab984f9595d70cd
parent2e741241c5b38725b1f2911e22312102155c0d72 (diff)
downloadscummvm-rg350-6ffcb714af5f446826b0c029ebcaed222291e961.tar.gz
scummvm-rg350-6ffcb714af5f446826b0c029ebcaed222291e961.tar.bz2
scummvm-rg350-6ffcb714af5f446826b0c029ebcaed222291e961.zip
AVALANCHE: Broaden Avalot::handleKeyDown().
-rw-r--r--engines/avalanche/avalot.cpp36
-rw-r--r--engines/avalanche/avalot.h2
2 files changed, 33 insertions, 5 deletions
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index 3363b92569..bdf74728c1 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -153,11 +153,38 @@ void Avalot::setup() {
-void Avalot::handleKeyDown(const Common::Event &event) {
+void Avalot::handleKeyDown(Common::Event &event) {
//if (keyboardclick)
// click();
//
// To be implemented later with the sounds, I assume.
+
+ switch (event.kbd.keycode) { // We can control Avvy with the numpad as well.
+ case Common::KEYCODE_KP8:
+ event.kbd.keycode = Common::KEYCODE_UP;
+ break;
+ case Common::KEYCODE_KP2:
+ event.kbd.keycode = Common::KEYCODE_DOWN;
+ break;
+ case Common::KEYCODE_KP6:
+ event.kbd.keycode = Common::KEYCODE_RIGHT;
+ break;
+ case Common::KEYCODE_KP4:
+ event.kbd.keycode = Common::KEYCODE_LEFT;
+ break;
+ case Common::KEYCODE_KP9:
+ event.kbd.keycode = Common::KEYCODE_PAGEUP;
+ break;
+ case Common::KEYCODE_KP3:
+ event.kbd.keycode = Common::KEYCODE_PAGEDOWN;
+ break;
+ case Common::KEYCODE_KP7:
+ event.kbd.keycode = Common::KEYCODE_HOME;
+ break;
+ case Common::KEYCODE_KP1:
+ event.kbd.keycode = Common::KEYCODE_END;
+ break;
+ }
switch (event.kbd.keycode) {
case Common::KEYCODE_UP:
@@ -170,7 +197,10 @@ void Avalot::handleKeyDown(const Common::Event &event) {
case Common::KEYCODE_END:
case Common::KEYCODE_KP5:
_vm->_trip->handleMoveKey(event); // Fallthroughs are intended.
- break;
+ _vm->_lucerna->showrw();
+ if (_vm->_gyro->demo)
+ _vm->_basher->get_demorec();
+ return;
case Common::KEYCODE_BACKSPACE:
_vm->_parser->handleBackspace();
break;
@@ -182,8 +212,6 @@ void Avalot::handleKeyDown(const Common::Event &event) {
if ((32 <= event.kbd.ascii) && (event.kbd.ascii <= 128) && (event.kbd.ascii != 47))
_vm->_parser->handleInputText(event);
-
-
_vm->_lucerna->showrw();
if (_vm->_gyro->demo)
_vm->_basher->get_demorec();
diff --git a/engines/avalanche/avalot.h b/engines/avalanche/avalot.h
index a053267c9b..c792a178a4 100644
--- a/engines/avalanche/avalot.h
+++ b/engines/avalanche/avalot.h
@@ -44,7 +44,7 @@ public:
- void handleKeyDown(const Common::Event &event); // To replace Basher::keyboard_link() and Basher::typein().
+ void handleKeyDown(Common::Event &event); // To replace Basher::keyboard_link() and Basher::typein().