aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2016-05-23 00:01:51 +0200
committerStrangerke2016-05-23 00:01:51 +0200
commit94e1e3a8fef3d9b7fee8fb50725bf5c7bf5325a6 (patch)
treea698f11d5ef53344c1499757696a58637aa397ed
parent13c363f4408ac517036a74fa220bf537848a80a5 (diff)
downloadscummvm-rg350-94e1e3a8fef3d9b7fee8fb50725bf5c7bf5325a6.tar.gz
scummvm-rg350-94e1e3a8fef3d9b7fee8fb50725bf5c7bf5325a6.tar.bz2
scummvm-rg350-94e1e3a8fef3d9b7fee8fb50725bf5c7bf5325a6.zip
GNAP: Use KeyCode value instead of numeric value for Backspace
-rw-r--r--engines/gnap/scenes/group0.cpp36
-rw-r--r--engines/gnap/scenes/group1.cpp36
-rw-r--r--engines/gnap/scenes/group2.cpp40
-rw-r--r--engines/gnap/scenes/group3.cpp24
-rw-r--r--engines/gnap/scenes/group4.cpp28
-rw-r--r--engines/gnap/scenes/group5.cpp4
6 files changed, 84 insertions, 84 deletions
diff --git a/engines/gnap/scenes/group0.cpp b/engines/gnap/scenes/group0.cpp
index b53037ee0e..0a31c66dc2 100644
--- a/engines/gnap/scenes/group0.cpp
+++ b/engines/gnap/scenes/group0.cpp
@@ -275,8 +275,8 @@ void Scene01::run() {
}
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -700,8 +700,8 @@ void Scene02::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -1161,8 +1161,8 @@ void Scene03::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
_vm->_timers[5] = _vm->getRandom(100) + 200;
@@ -1698,8 +1698,8 @@ void Scene04::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -2139,8 +2139,8 @@ void Scene05::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
_vm->_timers[5] = _vm->getRandom(20) + 30;
@@ -2547,8 +2547,8 @@ void Scene06::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -2855,8 +2855,8 @@ void Scene07::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
_vm->_timers[4] = _vm->getRandom(40) + 50;
@@ -3232,8 +3232,8 @@ void Scene08::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
_vm->_timers[4] = _vm->getRandom(50) + 75;
@@ -3523,8 +3523,8 @@ void Scene09::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
_vm->_timers[4] = _vm->getRandom(150) + 50;
diff --git a/engines/gnap/scenes/group1.cpp b/engines/gnap/scenes/group1.cpp
index 52767e1a23..6caff2e0d3 100644
--- a/engines/gnap/scenes/group1.cpp
+++ b/engines/gnap/scenes/group1.cpp
@@ -332,8 +332,8 @@ void Scene10::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -814,8 +814,8 @@ void Scene11::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
_vm->_timers[5] = _vm->getRandom(50) + 75;
@@ -1253,8 +1253,8 @@ void Scene12::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
_vm->_timers[4] = 30;
@@ -1770,8 +1770,8 @@ void Scene13::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
_vm->_timers[4] = _vm->getRandom(20) + 20;
@@ -1975,8 +1975,8 @@ void Scene14::run() {
_vm->_timers[2] = _vm->getRandom(40) + 50;
}
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -2197,8 +2197,8 @@ void Scene15::run() {
updateAnimations();
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -2833,8 +2833,8 @@ void Scene17::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -3809,8 +3809,8 @@ void Scene18::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -4355,8 +4355,8 @@ void Scene19::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
diff --git a/engines/gnap/scenes/group2.cpp b/engines/gnap/scenes/group2.cpp
index 78f7c04774..66cf5e5bab 100644
--- a/engines/gnap/scenes/group2.cpp
+++ b/engines/gnap/scenes/group2.cpp
@@ -506,8 +506,8 @@ void Scene20::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -930,8 +930,8 @@ void Scene21::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -1227,8 +1227,8 @@ void Scene22::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
_vm->_timers[2] = _vm->getRandom(30) + 20;
@@ -1461,8 +1461,8 @@ void Scene23::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -1728,8 +1728,8 @@ void Scene24::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -2033,8 +2033,8 @@ void Scene25::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -2291,8 +2291,8 @@ void Scene26::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -2582,8 +2582,8 @@ void Scene27::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -2955,8 +2955,8 @@ void Scene28::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -3338,8 +3338,8 @@ void Scene29::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
diff --git a/engines/gnap/scenes/group3.cpp b/engines/gnap/scenes/group3.cpp
index 6c93057346..b10e7975e5 100644
--- a/engines/gnap/scenes/group3.cpp
+++ b/engines/gnap/scenes/group3.cpp
@@ -203,8 +203,8 @@ void Scene30::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -528,8 +528,8 @@ void Scene31::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -777,8 +777,8 @@ void Scene32::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -1019,8 +1019,8 @@ void Scene33::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -1285,8 +1285,8 @@ void Scene38::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -1578,8 +1578,8 @@ void Scene39::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
_vm->_timers[5] = _vm->getRandom(20) + 50;
diff --git a/engines/gnap/scenes/group4.cpp b/engines/gnap/scenes/group4.cpp
index 7a5de8d37e..b12d2ad4a1 100644
--- a/engines/gnap/scenes/group4.cpp
+++ b/engines/gnap/scenes/group4.cpp
@@ -159,8 +159,8 @@ void Scene40::run() {
updateAnimations();
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -549,8 +549,8 @@ void Scene41::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
_vm->_timers[4] = _vm->getRandom(100) + 100;
@@ -1016,8 +1016,8 @@ void Scene42::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
_vm->_timers[4] = _vm->getRandom(20) + 30;
@@ -1472,8 +1472,8 @@ void Scene43::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
_vm->_timers[4] = _vm->getRandom(100) + 100;
@@ -1974,8 +1974,8 @@ void Scene44::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
_vm->_timers[4] = _vm->getRandom(20) + 20;
@@ -2381,8 +2381,8 @@ void Scene45::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
@@ -2731,8 +2731,8 @@ void Scene46::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}
diff --git a/engines/gnap/scenes/group5.cpp b/engines/gnap/scenes/group5.cpp
index a359da21db..46f4c51e5d 100644
--- a/engines/gnap/scenes/group5.cpp
+++ b/engines/gnap/scenes/group5.cpp
@@ -369,8 +369,8 @@ void Scene53::run() {
_vm->checkGameKeys();
- if (_vm->isKeyStatus1(8)) {
- _vm->clearKeyStatus1(8);
+ if (_vm->isKeyStatus1(Common::KEYCODE_BACKSPACE)) {
+ _vm->clearKeyStatus1(Common::KEYCODE_BACKSPACE);
_vm->runMenu();
updateHotspots();
}