aboutsummaryrefslogtreecommitdiff
path: root/engines/gnap/scenes
diff options
context:
space:
mode:
authorStrangerke2016-05-23 00:33:50 +0200
committerStrangerke2016-05-23 00:33:50 +0200
commit58fb1563cab13f912496fe3dcd42caef5978fef6 (patch)
treee09f51e1c868ef9aab027f28cf978ca49b691215 /engines/gnap/scenes
parent94e1e3a8fef3d9b7fee8fb50725bf5c7bf5325a6 (diff)
downloadscummvm-rg350-58fb1563cab13f912496fe3dcd42caef5978fef6.tar.gz
scummvm-rg350-58fb1563cab13f912496fe3dcd42caef5978fef6.tar.bz2
scummvm-rg350-58fb1563cab13f912496fe3dcd42caef5978fef6.zip
GNAP: Map remaining Key codes
Diffstat (limited to 'engines/gnap/scenes')
-rw-r--r--engines/gnap/scenes/arcade.cpp8
-rw-r--r--engines/gnap/scenes/group1.cpp4
-rw-r--r--engines/gnap/scenes/group2.cpp4
-rw-r--r--engines/gnap/scenes/intro.cpp4
-rw-r--r--engines/gnap/scenes/scenecore.cpp6
5 files changed, 13 insertions, 13 deletions
diff --git a/engines/gnap/scenes/arcade.cpp b/engines/gnap/scenes/arcade.cpp
index da66829a31..c4c5480b84 100644
--- a/engines/gnap/scenes/arcade.cpp
+++ b/engines/gnap/scenes/arcade.cpp
@@ -71,9 +71,9 @@ int Scene49::init() {
_vm->_timers[2] = 0;
_vm->_timers[0] = 0;
_vm->_timers[1] = 0;
- _vm->clearKeyStatus1(28);
- _vm->clearKeyStatus1(54);
- _vm->clearKeyStatus1(52);
+ _vm->clearKeyStatus1(Common::KEYCODE_ESCAPE);
+ _vm->clearKeyStatus1(Common::KEYCODE_RIGHT);
+ _vm->clearKeyStatus1(Common::KEYCODE_LEFT);
return 0xD5;
}
@@ -2704,7 +2704,7 @@ void Scene52::run() {
_alienWave = false;
_vm->_gameSys->waitForUpdate();
initAnims();
- _vm->clearKeyStatus1(30);
+ _vm->clearKeyStatus1(Common::KEYCODE_SPACE);
_vm->_sceneDone = true;
}
}
diff --git a/engines/gnap/scenes/group1.cpp b/engines/gnap/scenes/group1.cpp
index 6caff2e0d3..1a414cb2f4 100644
--- a/engines/gnap/scenes/group1.cpp
+++ b/engines/gnap/scenes/group1.cpp
@@ -1488,11 +1488,11 @@ void Scene13::showScribble() {
_vm->_largeSprite = gameSys.createSurface(0x6F);
gameSys.insertSpriteDrawItem(_vm->_largeSprite, 0, 0, 300);
while (!_vm->_mouseClickState._left && !_vm->isKeyStatus1(Common::KEYCODE_ESCAPE) &&
- !_vm->isKeyStatus1(Common::KEYCODE_SPACE) && !_vm->isKeyStatus1(29) && !_vm->_gameDone)
+ !_vm->isKeyStatus1(Common::KEYCODE_SPACE) && !_vm->isKeyStatus1(Common::KEYCODE_RETURN) && !_vm->_gameDone)
_vm->gameUpdateTick();
_vm->_mouseClickState._left = false;
_vm->clearKeyStatus1(Common::KEYCODE_ESCAPE);
- _vm->clearKeyStatus1(29);
+ _vm->clearKeyStatus1(Common::KEYCODE_RETURN);
_vm->clearKeyStatus1(Common::KEYCODE_SPACE);
gameSys.removeSpriteDrawItem(_vm->_largeSprite, 300);
_vm->deleteSurface(&_vm->_largeSprite);
diff --git a/engines/gnap/scenes/group2.cpp b/engines/gnap/scenes/group2.cpp
index 66cf5e5bab..d0a2131207 100644
--- a/engines/gnap/scenes/group2.cpp
+++ b/engines/gnap/scenes/group2.cpp
@@ -1800,12 +1800,12 @@ void Scene25::playAnims(int index) {
gameSys.insertSpriteDrawItem(_vm->_largeSprite, 0, 0, 300);
_vm->delayTicksCursor(5);
while (!_vm->_mouseClickState._left && !_vm->isKeyStatus1(Common::KEYCODE_ESCAPE) && !_vm->isKeyStatus1(Common::KEYCODE_SPACE) &&
- !_vm->isKeyStatus1(29) && !_vm->_gameDone) {
+ !_vm->isKeyStatus1(Common::KEYCODE_RETURN) && !_vm->_gameDone) {
_vm->gameUpdateTick();
}
_vm->_mouseClickState._left = false;
_vm->clearKeyStatus1(Common::KEYCODE_ESCAPE);
- _vm->clearKeyStatus1(29);
+ _vm->clearKeyStatus1(Common::KEYCODE_RETURN);
_vm->clearKeyStatus1(Common::KEYCODE_SPACE);
gameSys.removeSpriteDrawItem(_vm->_largeSprite, 300);
_vm->delayTicksCursor(5);
diff --git a/engines/gnap/scenes/intro.cpp b/engines/gnap/scenes/intro.cpp
index 1679fe8306..b4ba2f5201 100644
--- a/engines/gnap/scenes/intro.cpp
+++ b/engines/gnap/scenes/intro.cpp
@@ -157,10 +157,10 @@ void SceneIntro::run() {
}
}
- if (_vm->isKeyStatus1(Common::KEYCODE_ESCAPE) || _vm->isKeyStatus1(Common::KEYCODE_SPACE) || _vm->isKeyStatus1(29)) {
+ if (_vm->isKeyStatus1(Common::KEYCODE_ESCAPE) || _vm->isKeyStatus1(Common::KEYCODE_SPACE) || _vm->isKeyStatus1(Common::KEYCODE_RETURN)) {
_vm->clearKeyStatus1(Common::KEYCODE_ESCAPE);
_vm->clearKeyStatus1(Common::KEYCODE_SPACE);
- _vm->clearKeyStatus1(29);
+ _vm->clearKeyStatus1(Common::KEYCODE_RETURN);
if (index == 0) {
skip = true;
_vm->stopSound(0x3CF);
diff --git a/engines/gnap/scenes/scenecore.cpp b/engines/gnap/scenes/scenecore.cpp
index c6e32e07c1..d34f46037f 100644
--- a/engines/gnap/scenes/scenecore.cpp
+++ b/engines/gnap/scenes/scenecore.cpp
@@ -677,7 +677,7 @@ void CutScene::run() {
_vm->clearKeyStatus1(Common::KEYCODE_ESCAPE);
_vm->clearKeyStatus1(Common::KEYCODE_SPACE);
- _vm->clearKeyStatus1(29);
+ _vm->clearKeyStatus1(Common::KEYCODE_RETURN);
_vm->_mouseClickState._left = false;
@@ -701,10 +701,10 @@ void CutScene::run() {
}
}
- if (_vm->isKeyStatus1(Common::KEYCODE_ESCAPE) || _vm->isKeyStatus1(Common::KEYCODE_SPACE) || _vm->isKeyStatus1(29)) {
+ if (_vm->isKeyStatus1(Common::KEYCODE_ESCAPE) || _vm->isKeyStatus1(Common::KEYCODE_SPACE) || _vm->isKeyStatus1(Common::KEYCODE_RETURN)) {
_vm->clearKeyStatus1(Common::KEYCODE_ESCAPE);
_vm->clearKeyStatus1(Common::KEYCODE_SPACE);
- _vm->clearKeyStatus1(29);
+ _vm->clearKeyStatus1(Common::KEYCODE_RETURN);
if (_canSkip[itemIndex])
skip = true;
else