[Scummvm-cvs-logs] scummvm master -> 4c97e08e33f5a94c62c7ae480d05eae85a6721b6

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4c97e08e33 MADS: Fix some verbs


Commit: 4c97e08e33f5a94c62c7ae480d05eae85a6721b6
    https://github.com/scummvm/scummvm/commit/4c97e08e33f5a94c62c7ae480d05eae85a6721b6
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2015-03-14T12:50:04+02:00

Commit Message:
MADS: Fix some verbs

Changed paths:
    engines/mads/nebular/nebular_scenes.h
    engines/mads/nebular/nebular_scenes3.cpp
    engines/mads/nebular/nebular_scenes5.cpp



diff --git a/engines/mads/nebular/nebular_scenes.h b/engines/mads/nebular/nebular_scenes.h
index 8549643..db7738f 100644
--- a/engines/mads/nebular/nebular_scenes.h
+++ b/engines/mads/nebular/nebular_scenes.h
@@ -106,6 +106,7 @@ enum Verb {
 	VERB_WALK_UP        = 0x227,
 	VERB_WALK_INTO      = 0x242,
 	VERB_EXIT           = 0x298,
+	VERB_WALK_BEHIND    = 0x2A2,
 	VERB_WALK_ONTO      = 0x2B5,
 	VERB_RETURN_TO      = 0x2D5,
 	VERB_CLIMB_INTO     = 0x2F7,
@@ -216,9 +217,9 @@ enum Noun {
 	NOUN_CLEARING_TO_EAST = 0x4B,
 	NOUN_CLEARING_TO_SOUTH = 0x4C,
 	NOUN_CLIFF_FACE = 0x4D,
-	NOUN_CLIMB_DOWN = 0x4E,
-	NOUN_CLIMB_THROUGH = 0x4F,
-	NOUN_CLIMB_UP = 0x50,
+	//NOUN_CLIMB_DOWN = 0x4E,
+	//NOUN_CLIMB_THROUGH = 0x4F,
+	//NOUN_CLIMB_UP = 0x50,
 	NOUN_CLOCK = 0x51,
 	NOUN_CLOSET = 0x52,
 	NOUN_CLOTHESLINE = 0x53,
@@ -397,7 +398,7 @@ enum Noun {
 	NOUN_PALM_TREE = 0x100,
 	NOUN_PASSAGE_WAY_TO_SOUTH = 0x101,
 	NOUN_PASSION_PUSS = 0x102,
-	NOUN_PEER_THROUGH = 0x103,
+	//NOUN_PEER_THROUGH = 0x103,
 	NOUN_PENCIL = 0x104,
 	NOUN_PENDULOUS_CRAG = 0x105,
 	NOUN_PENLIGHT = 0x106,
@@ -812,7 +813,7 @@ enum Noun {
 	NOUN_COUNTER = 0x29F,
 	NOUN_SENSOR = 0x2A0,
 	NOUN_SOFTWARE_INFORMATION = 0x2A1,
-	NOUN_WALK_BEHIND = 0x2A2,
+	//NOUN_WALK_BEHIND = 0x2A2,
 	NOUN_BARGAINS = 0x2A3,
 	NOUN_SCAN_LIGHT = 0x2A4,
 	NOUN_OLD_SOFTWARE_STAND = 0x2A5,
@@ -831,7 +832,7 @@ enum Noun {
 	//NOUN_GAWK_AT = 0x2B2,
 	NOUN_CORRIDOR_TO_SOUTH = 0x2B3,
 	NOUN_CORRIDOR_TO_NORTH = 0x2B4,
-	NOUN_WALK_ONTO = 0x2B5,
+	//NOUN_WALK_ONTO = 0x2B5,
 	NOUN_ROCK_WALL = 0x2B6,
 	NOUN_WOMAN = 0x2B7,
 	NOUN_WOMEN = 0x2B8,
@@ -897,7 +898,7 @@ enum Noun {
 	NOUN_YOUR_STUFF = 0x2F4,
 	NOUN_OTHER_STUFF = 0x2F5,
 	NOUN_LAMP = 0x2F6,
-	NOUN_CLIMB_INTO = 0x2F7,
+	//NOUN_CLIMB_INTO = 0x2F7,
 	NOUN_LIGHT_BULB = 0x2F8,
 	//NOUN_STEP_INTO = 0x2F9,
 	NOUN_ROOM = 0x2FA,
@@ -1056,7 +1057,7 @@ enum Noun {
 	NOUN_PAD_TO_EAST = 0x394,
 	NOUN_PAD_TO_WEST = 0x395,
 	NOUN_TOWER = 0x396,
-	NOUN_LOOK_OUT = 0x397,
+	//NOUN_LOOK_OUT = 0x397,
 	NOUN_SERVICE_PANEL = 0x398,
 	NOUN_CRACK = 0x399,
 	NOUN_THROTTLE = 0x39A,
diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 1a477c3..d6c7ba1 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -521,7 +521,7 @@ void Scene307::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 	_scene->addActiveVocab(NOUN_AIR_VENT);
-	_scene->addActiveVocab(NOUN_CLIMB_INTO);
+	_scene->addActiveVocab(VERB_CLIMB_INTO);
 }
 
 void Scene307::handleRexDialog(int quote) {
@@ -992,7 +992,7 @@ void Scene307::actions() {
 			_scene->_sequences.remove(_globals._sequenceIndexes[5]);
 			_grateOpenedFl = true;
 			_scene->_hotspots.activate(17, false);
-			int idx = _scene->_dynamicHotspots.add(17, NOUN_CLIMB_INTO, -1, Common::Rect(117, 67, 117 + 19, 67 + 13));
+			int idx = _scene->_dynamicHotspots.add(17, VERB_CLIMB_INTO, -1, Common::Rect(117, 67, 117 + 19, 67 + 13));
 			int hotspotId = _scene->_dynamicHotspots.setPosition(idx, Common::Point(129, 104), FACING_NORTH);
 			_scene->_dynamicHotspots.setCursor(hotspotId, CURSOR_GO_UP);
 			_game._objects.removeFromInventory(OBJ_SCALPEL, NOWHERE);
diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index e6ab658..a76edac 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -1547,8 +1547,8 @@ void Scene507::actions() {
 		_vm->_dialogs->show(50724);
 	else if (_action.isAction(VERB_LOOK, NOUN_WINDOW))
 		_vm->_dialogs->show(50725);
-	else if (_action.isAction(NOUN_WALK_BEHIND, NOUN_COUNTER)) {
-		// WORkAROUND: Empty handling to prevent default "can't do that" dialogs showing
+	else if (_action.isAction(VERB_WALK_BEHIND, NOUN_COUNTER)) {
+		// WORKAROUND: Empty handling to prevent default "can't do that" dialogs showing
 	} else if (_action.isAction(VERB_LOOK, NOUN_COUNTER)) {
 		if (_game._objects.isInRoom(OBJ_PENLIGHT))
 			_vm->_dialogs->show(50728);
@@ -2463,8 +2463,8 @@ void Scene512::actions() {
 		_vm->_dialogs->show(51233);
 	else if (_action.isAction(VERB_LOOK, NOUN_LAMP))
 		_vm->_dialogs->show(51234);
-	else if (_action.isAction(NOUN_WALK_BEHIND, NOUN_COUNTER)) {
-		// WORkAROUND: Empty handling to prevent default "can't do that" dialogs showing
+	else if (_action.isAction(VERB_WALK_BEHIND, NOUN_COUNTER)) {
+		// WORKAROUND: Empty handling to prevent default "can't do that" dialogs showing
 	} else if (_action.isAction(VERB_LOOK, NOUN_COUNTER))
 		_vm->_dialogs->show(51235);
 	else if (_action.isAction(VERB_LOOK, NOUN_ICE_CHESTS))