GNAP: Map remaining Key codes

7 files changed, 24 insertions, 23 deletions

diff --git a/engines/gnap/gnap.cpp b/engines/gnap/gnap.cpp
index c951a5f44b..afb77ebea9 100644
--- a/engines/gnap/gnap.cpp
+++ b/engines/gnap/gnap.cpp
@@ -570,13 +570,13 @@ void GnapEngine::showFullScreenSprite(int resourceId) {
 	hideCursor();
 	setGrabCursorSprite(-1);
 	addFullScreenSprite(resourceId, 256);
-	while (!_mouseClickState._left && !isKeyStatus1(Common::KEYCODE_ESCAPE) &&
-		!isKeyStatus1(Common::KEYCODE_SPACE) && !isKeyStatus1(29) && !_gameDone) {
+	while (!_mouseClickState._left && !isKeyStatus1(Common::KEYCODE_ESCAPE)
+		&& !isKeyStatus1(Common::KEYCODE_SPACE) && !isKeyStatus1(Common::KEYCODE_RETURN) && !_gameDone) {
 		gameUpdateTick();
 	}
 	_mouseClickState._left = false;
 	clearKeyStatus1(Common::KEYCODE_ESCAPE);
-	clearKeyStatus1(29);
+	clearKeyStatus1(Common::KEYCODE_RETURN);
 	clearKeyStatus1(Common::KEYCODE_SPACE);
 	removeFullScreenSprite();
 	showCursor();
@@ -739,8 +739,8 @@ void GnapEngine::mainLoop() {
 		_soundCache->purge(true);
 		_spriteCache->purge(true);
 
-		if (isKeyStatus1(28)) {
-			clearKeyStatus1(28);
+		if (isKeyStatus1(Common::KEYCODE_ESCAPE)) {
+			clearKeyStatus1(Common::KEYCODE_ESCAPE);
 			if (_debugLevel == 4)
 				_gameDone = true;
 		}
diff --git a/engines/gnap/menu.cpp b/engines/gnap/menu.cpp
index ff3d94e88b..82191b053e 100644
--- a/engines/gnap/menu.cpp
+++ b/engines/gnap/menu.cpp
@@ -238,7 +238,7 @@ void GnapEngine::runMenu() {
 
 	_timers[2] = 10;
 
-	while (!isKeyStatus1(8) && !isKeyStatus1(28) && !_sceneDone && !_menuDone) {
+	while (!isKeyStatus1(Common::KEYCODE_BACKSPACE) && !isKeyStatus1(Common::KEYCODE_ESCAPE) && !_sceneDone && !_menuDone) {
 		updateCursorByHotspot();
 
 		switch (_menuStatus) {
@@ -422,14 +422,15 @@ void GnapEngine::updateMenuStatusMainMenu() {
 						_gameSys->insertDirtyRect(dirtyRect);
 					}
 
-					while (!_mouseClickState._left && !isKeyStatus1(28) && !isKeyStatus1(30) && !isKeyStatus1(29) && !_timers[2] && !_gameDone)
+					while (!_mouseClickState._left && !isKeyStatus1(Common::KEYCODE_ESCAPE) && !isKeyStatus1(Common::KEYCODE_RETURN)
+							&& !isKeyStatus1(Common::KEYCODE_SPACE) && !_timers[2] && !_gameDone)
 						gameUpdateTick();
 
 					playSound(0x108F5, false);
 					_mouseClickState._left = false;
-					clearKeyStatus1(28);
-					clearKeyStatus1(29);
-					clearKeyStatus1(30);
+					clearKeyStatus1(Common::KEYCODE_ESCAPE);
+					clearKeyStatus1(Common::KEYCODE_RETURN);
+					clearKeyStatus1(Common::KEYCODE_SPACE);
 				}
 
 				_gameSys->removeSpriteDrawItem(_largeSprite, 300);
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