MADS: Phantom: Move Exit and Climb to verbs. Review calls to isAction…

…, use isObject instead when needed
scummvm · Oct 20, 2015 · 44a28db · 44a28db
1 parent 3864ad1
commit 44a28db
Show file tree

Hide file tree

Showing 2 changed files with 208 additions and 208 deletions.
diff --git a/engines/mads/phantom/phantom_scenes.h b/engines/mads/phantom/phantom_scenes.h
@@ -49,6 +49,7 @@ enum Verb {
 	VERB_CLIMB_DOWN = 0x21,
 	VERB_CLIMB_INTO = 0x22,
 	VERB_CLIMB_THROUGH = 0x23,
+	VERB_EXIT = 0x34,
 	VERB_EXIT_TO = 0x37,
 	VERB_JUMP_INTO = 0x53,
 	VERB_LOCK = 0x5D,
@@ -63,7 +64,8 @@ enum Verb {
 	VERB_WALK_UP = 0x9C,
 	VERB_CLIMB_UP = 0xA5,
 	VERB_WALK_ONTO = 0xA6,
-	VERB_WALK = 0xA7
+	VERB_WALK = 0xA7,
+	VERB_CLIMB = 0x120
 };
 
 enum Noun {
@@ -104,7 +106,6 @@ enum Noun {
 	NOUN_DRESSING_TABLE = 0x31,
 	NOUN_ELEPHANT_PROP = 0x32,
 	NOUN_ENVELOPE = 0x33,
-	NOUN_EXIT = 0x34,
 	NOUN_EXIT_DOWN = 0x35,
 	NOUN_EXIT_SIGN = 0x36,
 	NOUN_EXIT_TO_BACKSTAGE = 0x38,
@@ -325,7 +326,6 @@ enum Noun {
 	NOUN_MIDDLE_LEVEL = 0x11D,
 	NOUN_LOWER_LEVEL = 0x11E,
 	NOUN_LADDER = 0x11F,
-	NOUN_CLIMB = 0x120,
 	NOUN_CHANDELIER_TRAP = 0x121,
 	NOUN_PIECE_OF_WOOD = 0x122,
 	NOUN_CUT_HEMP = 0x123,