From 600a715661333565e8546dfcafabf5e1da95d340 Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 10 May 2014 13:22:45 +0300
Subject: MADS: Split verbs from nouns

---
 engines/mads/nebular/nebular_scenes.h | 45 ++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 17 deletions(-)

(limited to 'engines/mads/nebular/nebular_scenes.h')

diff --git a/engines/mads/nebular/nebular_scenes.h b/engines/mads/nebular/nebular_scenes.h
index 2f9dff706d..3534613431 100644
--- a/engines/mads/nebular/nebular_scenes.h
+++ b/engines/mads/nebular/nebular_scenes.h
@@ -38,6 +38,32 @@ enum {
 	SEX_MALE = 0, SEX_UNKNOWN = 1, SEX_FEMALE = 2
 };
 
+enum Verb {
+	VERB_CLIMB_DOWN     = 0x04E,
+	VERB_EAT			= 0x075,
+	VERB_EXAMINE		= 0x07D,
+	VERB_HOSE_DOWN		= 0x0A6,
+	VERB_IGNITE			= 0x0B4,
+	VERB_INFLATE		= 0x0B5,
+	VERB_INSERT			= 0x0B6,
+	VERB_INSPECT		= 0x0B7,
+	VERB_HURL			= 0x0A9,
+	VERB_LOOK_AT		= 0x0D1,
+	VERB_LOOK_IN		= 0x0D2,
+	VERB_LOOK_THROUGH	= 0x0D3,
+	VERB_PEER_THROUGH	= 0x103,
+	VERB_READ			= 0x11F,
+	VERB_SHOOT          = 0x13A,
+	VERB_SIT_IN         = 0x13F,
+	VERB_SMELL			= 0x147,
+	VERB_WALK_THROUGH   = 0x18B,
+	VERB_WALK_TOWARDS   = 0x18C,
+	VERB_WALK_DOWN      = 0x1AD,
+	VERB_CLIMB_INTO     = 0x2F7,
+	VERB_STEP_INTO      = 0x2F9,
+	VERB_WALK_ALONG     = 0x312,
+};
+
 enum Noun {
 	NOUN_BIG_LEAVES     = 0x23,
 	NOUN_BLOWGUN        = 0x29,
@@ -51,50 +77,34 @@ enum Noun {
 	NOUN_CHICKEN_BOMB   = 0x4A,
 	NOUN_DEAD_FISH		= 0x65,
 	NOUN_DOOR			= 0x6E,
-	NOUN_EAT			= 0x75,
-	NOUN_EXAMINE		= 0x7D,
+	NOUN_FISHING_LINE	= 0x87,
 	NOUN_FRONT_WINDOW	= 0x8E,
 	NOUN_FUZZY_DICE		= 0x91,
-	NOUN_HOSE_DOWN		= 0x0A6,
 	NOUN_HOTPANTS		= 0x0A7,
 	NOUN_HULL			= 0x0A8,
-	NOUN_HURL			= 0x0A9,
 	NOUN_ID_CARD        = 0x0B3,
-	NOUN_IGNITE			= 0x0B4,
-	NOUN_INFLATE		= 0x0B5,
-	NOUN_INSERT			= 0x0B6,
-	NOUN_INSPECT		= 0x0B7,
 	NOUN_JUNGLE			= 0x0B8,
 	NOUN_LADDER         = 0x0C7,
 	NOUN_LIFE_SUPPORT_SECTION  = 0x0CC,
 	NOUN_LOG			= 0x0D0,
-	NOUN_LOOK_AT		= 0x0D1,
-	NOUN_LOOK_IN		= 0x0D2,
-	NOUN_LOOK_THROUGH	= 0x0D3,
 	NOUN_MONKEY			= 0x0E3,
 	NOUN_OUTER_HULL		= 0x0F8,
 	NOUN_OUTSIDE		= 0x0F9,
-	NOUN_PEER_THROUGH	= 0x103,
 	NOUN_PIRANHA        = 0x10D,
 	NOUN_PLANT_STALK	= 0x10F,
-	NOUN_READ			= 0x11F,
 	NOUN_REFRIDGERATOR	= 0x122,
 	NOUN_ROBO_KITCHEN	= 0x127,
 	NOUN_ROCK           = 0x128,
 	NOUN_SHIELD_ACCESS_PANEL  = 0x135,
 	NOUN_SHIELD_MODULATOR	= 0x137,
-	NOUN_SHOOT			= 0x13A,
-	NOUN_SIT_IN			= 0x13F,
 	NOUN_SKULL          = 0x140,
 	NOUN_TELEPORTER     = 0x16C,
 	NOUN_BROKEN_LADDER  = 0x1C9,
-	NOUN_SMELL			= 0x147,
 	NOUN_STUFFED_FISH	= 0x157,
 	NOUN_15F            = 0x15F,
 	NOUN_TIMEBOMB       = 0x171,
 	NOUN_TWINKIFRUIT    = 0x17A,
 	NOUN_VIEW_SCREEN    = 0x180,
-	NOUN_WALK_THROUGH	= 0x18B,
 	NOUN_DEEP_PIT       = 0x19E,
 	NOUN_HUGE_LEGS      = 0x1A8,
 	NOUN_LEAF_COVERED_PIT  = 0x1A9,
@@ -105,6 +115,7 @@ enum Noun {
 	NOUN_ALCOHOL        = 0x310,
 	NOUN_SUBMERGED_CITY = 0x313,
 	NOUN_LASER_BEAM     = 0x343,
+	NOUN_BOAT           = 0x345,
 	NOUN_CEMENT_BLOCK   = 0x38E,
 	NOUN_CITY           = 0x38F,
 	NOUN_DOLLOP			= 0x3AC,
-- 
cgit v1.2.3