MADS: Replace more verbs with their friendly names

5 files changed, 33 insertions, 27 deletions

diff --git a/engines/mads/nebular/nebular_scenes.h b/engines/mads/nebular/nebular_scenes.h
index 674e785a50..e385c6a54b 100644
--- a/engines/mads/nebular/nebular_scenes.h
+++ b/engines/mads/nebular/nebular_scenes.h
@@ -67,16 +67,22 @@ enum Verb {
 	VERB_SWIM_TO        = 0x15C,
 	VERB_SWIM_TOWARDS   = 0x15D,
 	VERB_SWIM_UNDER     = 0x15E,
+	VERB_UNLOCK         = 0x17B,
 	VERB_WALK_INSIDE    = 0x188,
 	VERB_WALK_THROUGH   = 0x18B,
 	VERB_WALK_TOWARDS   = 0x18C,
 	VERB_WALK_DOWN      = 0x1AD,
 	VERB_EXIT_FROM      = 0x1CE,
+	VERB_WALK_UP        = 0x227,
+	VERB_WALK_INTO      = 0x242,
 	VERB_EXIT           = 0x298,
+	VERB_WALK_ONTO      = 0x2B5,
 	VERB_CLIMB_INTO     = 0x2F7,
 	VERB_STEP_INTO      = 0x2F9,
 	VERB_SIT_ON         = 0x30B,
 	VERB_WALK_ALONG     = 0x312,
+	VERB_WALK           = 0x32F,
+	VERB_GET_INTO       = 0x36A,
 	VERB_ENTER          = 0x3B8,
 	VERB_INSTALL        = 0x474,
 	VERB_REMOVE         = 0x476
diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index d0dd47759c..b0085d572f 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -1111,7 +1111,7 @@ void Scene307::actions() {
 		_vm->_dialogs->show(30717);
 	else if (_action.isAction(VERB_LOOK, 0xCD))
 		_vm->_dialogs->show(30718);
-	else if (_action.isAction(0x242, 0x204)) {
+	else if (_action.isAction(VERB_WALK_INTO, 0x204)) {
 		switch (_fieldCollisionCounter) {
 		case 0:
 			_vm->_dialogs->show(30719);
@@ -2263,7 +2263,7 @@ void Scene316::actions() {
 			handleRoxInGrate();
 		else
 			handleRexInGrate();
-	} else if (_action.isAction(0x227, 0x226) || _action.isAction(0x2B5, 0x22C)) {
+	} else if (_action.isAction(VERB_WALK_UP, 0x226) || _action.isAction(VERB_WALK_ONTO, 0x22C)) {
 		switch (_game._trigger) {
 		case 0:
 			if (_globals[kCityFlooded]) {
@@ -2859,7 +2859,7 @@ void Scene318::actions() {
 			return;
 		}
 
-		if (_action.isAction(0x242, 0x488)) {
+		if (_action.isAction(VERB_WALK_INTO, 0x488)) {
 			_vm->_dialogs->show(31831);
 			_action._inProgress = false;
 			return;
diff --git a/engines/mads/nebular/nebular_scenes4.cpp b/engines/mads/nebular/nebular_scenes4.cpp
index 2053c47cf1..d8f3607f38 100644
--- a/engines/mads/nebular/nebular_scenes4.cpp
+++ b/engines/mads/nebular/nebular_scenes4.cpp
@@ -204,7 +204,7 @@ void Scene401::actions() {
 		}
 	}
 
-	if (_action.isAction(0x242, 0x241)) {
+	if (_action.isAction(VERB_WALK_INTO, 0x241)) {
 		if (!_northFl)
 			_scene->_nextSceneId = 402;
 	} else if (_action.isAction(VERB_WALK_DOWN, 0x2B4))
@@ -2048,9 +2048,9 @@ void Scene402::actions() {
 		_game._player._stepEnabled = true;
 	} else if (_game._screenObjects._inputMode == 1)
 		handleDialogs();
-	else if (_action.isAction(0x242, 0x2B3))
+	else if (_action.isAction(VERB_WALK_INTO, 0x2B3))
 		_scene->_nextSceneId = 401;
-	else if (_action.isAction(0x2B5, 0x248))
+	else if (_action.isAction(VERB_WALK_ONTO, 0x248))
 		; // just... nothing
 	else if (_action.isAction(VERB_TALKTO, 0x3AA)) {
 		switch (_game._trigger) {
@@ -2878,7 +2878,7 @@ void Scene408::preActions() {
 }
 
 void Scene408::actions() {
-	if (_action.isAction(0x242, 0x2B3)) {
+	if (_action.isAction(VERB_WALK_INTO, 0x2B3)) {
 		_scene->_nextSceneId = 405;
 		_vm->_sound->command(58);
 	} else if (_action.isAction(VERB_TAKE, 0x167) && (_game._objects.isInRoom(OBJ_TARGET_MODULE) || _game._trigger)) {
@@ -3127,7 +3127,7 @@ void Scene410::preActions() {
 }
 
 void Scene410::actions() {
-	if (_action.isAction(0x242, 0x2B3))
+	if (_action.isAction(VERB_WALK_INTO, 0x2B3))
 		_scene->_nextSceneId = 406;
 	else if (_action.isAction(VERB_TAKE, 0x48) && (_game._objects.isInRoom(OBJ_CHARGE_CASES) || _game._trigger)) {
 		switch (_game._trigger) {
@@ -3704,7 +3704,7 @@ void Scene411::actions() {
 		return;
 	}
 
-	if (_action.isAction(0x242, 0x2B3)) {
+	if (_action.isAction(VERB_WALK_INTO, 0x2B3)) {
 		_scene->_nextSceneId = 406;
 		_vm->_sound->command(10);
 		_action._inProgress = false;
diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index 44363ec2ae..ef7ef89240 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -279,7 +279,7 @@ void Scene501::preActions() {
 }
 
 void Scene501::actions() {
-	if (_action.isAction(0x36A, 0x324)) {
+	if (_action.isAction(VERB_GET_INTO, 0x324)) {
 		switch (_game._trigger) {
 		case 0:
 			_game._player._stepEnabled = false;
@@ -544,7 +544,7 @@ void Scene503::enter() {
 }
 
 void Scene503::actions() {
-	if (_action.isAction(0x32F, 0xF9))
+	if (_action.isAction(VERB_WALK, 0xF9))
 		_scene->_nextSceneId = 501;
 	else if (_action.isAction(VERB_TAKE, 0x6A)) {
 		if ( _game._trigger || !_game._objects.isInInventory(OBJ_DETONATORS)) {
@@ -626,7 +626,7 @@ void Scene503::actions() {
 		_vm->_dialogs->show(50327);
 	else if (_action.isAction(VERB_OPEN, 0x36D))
 		_vm->_dialogs->show(50329);
-	else if (_action.isAction(0xC, 0x36D) && _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId)))
+	else if (_action.isAction(VERB_THROW, 0x36D) && _game._objects.isInInventory(_game._objects.getIdFromDesc(_action._activeAction._objectNameId)))
 		_vm->_dialogs->show(50330);
 	else
 		return;
@@ -1186,7 +1186,7 @@ void Scene506::room_506_door_sequences() {
 	_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
 
 	if (_firstDoorFl) {
-		if (_action.isAction(0x242, 0x336) || ((_scene->_priorSceneId == 507) && !_actionFl)) {
+		if (_action.isAction(VERB_WALK_INTO, 0x336) || ((_scene->_priorSceneId == 507) && !_actionFl)) {
 			_doorDepth = 13;
 			_doorSpriteIdx = _globals._spriteIndexes[2];
 			_doorSequenceIdx = _globals._sequenceIndexes[2];
@@ -1266,21 +1266,21 @@ void Scene506::room_506_door_sequences() {
 }
 
 void Scene506::actions() {
-	if (_action.isAction(0x242, 0x37D)) {
+	if (_action.isAction(VERB_WALK_INTO, 0x37D)) {
 		if (_firstDoorFl) {
 			_heroFacing = FACING_NORTHWEST;
 			_doorPos = Common::Point(16, 111);
 		}
 		_actionFl = true;
 		room_506_door_sequences();
-	} else if (_action.isAction(0x242, 0x336)) {
+	} else if (_action.isAction(VERB_WALK_INTO, 0x336)) {
 		if (_firstDoorFl) {
 			_heroFacing = FACING_NORTHWEST;
 			_doorPos = Common::Point(80, 102);
 		}
 		_actionFl = true;
 		room_506_door_sequences();
-	} else if (_action.isAction(0x36A, 0x324)) {
+	} else if (_action.isAction(VERB_GET_INTO, 0x324)) {
 		switch (_game._trigger) {
 		case 0:
 			_game._player._stepEnabled = false;
@@ -1528,7 +1528,7 @@ void Scene508::enter() {
 }
 
 void Scene508::preActions() {
-	if (_action.isAction(0x32F, 0xF9))
+	if (_action.isAction(VERB_WALK, 0xF9))
 		_game._player._walkOffScreenSceneId = 506;
 }
 
@@ -1882,9 +1882,9 @@ void Scene511::preActions() {
 }
 
 void Scene511::actions() {
-	if (_action.isAction(0x242, 0x372))
+	if (_action.isAction(VERB_WALK_INTO, 0x372))
 		_scene->_nextSceneId = 512;
-	else if (_action.isAction(0x36A, 0x324)) {
+	else if (_action.isAction(VERB_GET_INTO, 0x324)) {
 		switch (_game._trigger) {
 		case 0:
 			_game._player._stepEnabled = false;
@@ -2004,7 +2004,7 @@ void Scene511::actions() {
 		_vm->_dialogs->show(51117);
 	else if (_action.isAction(VERB_LOOK, 0x37C))
 		_vm->_dialogs->show(51118);
-	else if (_action.isAction(0x17B, 0xFF, 0x37C) || _action.isAction(0x17B, 0x6F, 0x37C))
+	else if (_action.isAction(VERB_UNLOCK, 0xFF, 0x37C) || _action.isAction(VERB_UNLOCK, 0x6F, 0x37C))
 		_vm->_dialogs->show(51119);
 	else if ( (_action.isAction(VERB_PUT) || _action.isAction(VERB_THROW))
 		 && (_action.isAction(0x171) || _action.isAction(0x2A) || _action.isAction(0x2B))
@@ -2102,7 +2102,7 @@ void Scene512::enter() {
 }
 
 void Scene512::actions() {
-	if (_action.isAction(0x32F, 0xF9))
+	if (_action.isAction(VERB_WALK, 0xF9))
 		_scene->_nextSceneId = 511;
 	else if (_action.isAction(VERB_TAKE, 0x88)) {
 		if (_game._trigger || !_game._objects.isInInventory(OBJ_FISHING_ROD)) {
@@ -2436,7 +2436,7 @@ void Scene513::step() {
 }
 
 void Scene513::actions() {
-	if (_action.isAction(0x36A, 0x324)) {
+	if (_action.isAction(VERB_GET_INTO, 0x324)) {
 		switch (_game._trigger) {
 		case 0:
 			_game._player._stepEnabled = false;
diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index 0921cebe50..519898472f 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -395,7 +395,7 @@ void Scene602::actions() {
 		_safeMode = 2;
 		_cycleIndex = -1;
 		handleSafeActions();
-	} else if (_action.isAction(0x17B, 0x3A7, 0x3D3)) {
+	} else if (_action.isAction(VERB_UNLOCK, 0x3A7, 0x3D3)) {
 		if ((_globals[kSafeStatus] == 0) && (_game._difficulty != DIFFICULTY_HARD)) {
 			_safeMode = 3;
 			_cycleIndex = -2;
@@ -506,7 +506,7 @@ void Scene602::actions() {
 			_vm->_dialogs->show(60235);
 		else
 			_vm->_dialogs->show(60236);
-	} else if (_action.isAction(0x17B, 0x6F, 0x3D3) || _action.isAction(0x17B, 0xFF, 0x3D3))
+	} else if (_action.isAction(VERB_UNLOCK, 0x6F, 0x3D3) || _action.isAction(VERB_UNLOCK, 0xFF, 0x3D3))
 		_vm->_dialogs->show(60225);
 	else if (_action.isAction(VERB_PULL, 0x3D3))
 		_vm->_dialogs->show(60226);
@@ -2581,7 +2581,7 @@ void Scene609::enterStore() {
 }
 
 void Scene609::preActions() {
-	if (_action.isAction(0x17B, 0x6F, 0x425))
+	if (_action.isAction(VERB_UNLOCK, 0x6F, 0x425))
 		_game._player.walk(Common::Point(78, 99), FACING_NORTHWEST);
 }
 
@@ -2629,7 +2629,7 @@ void Scene609::actions() {
 			_videoDoorMode = 2;
 			enterStore();
 		}
-	} else if (_action.isAction(0x17B, 0x6F, 0x425)) {
+	} else if (_action.isAction(VERB_UNLOCK, 0x6F, 0x425)) {
 		_videoDoorMode = 1;
 		enterStore();
 	} else if (_action.isAction(0x325, 0x324)) {
@@ -4424,7 +4424,7 @@ void Scene612::actions() {
 		default:
 			break;
 		}
-	} else if (_action.isAction(0x17B, 0xFF, 0x45F)) {
+	} else if (_action.isAction(VERB_UNLOCK, 0xFF, 0x45F)) {
 		_cycleIndex = -2;
 		action = 1;
 		handleWinchMovement();