MADS: Phantom: Implement scene 504

scummvm · Nov 7, 2015 · 1b75381 · 1b75381
1 parent 178e45f
commit 1b75381
Show file tree

Hide file tree

Showing 4 changed files with 1,441 additions and 35 deletions.
diff --git a/engines/mads/phantom/phantom_scenes.cpp b/engines/mads/phantom/phantom_scenes.cpp
@@ -147,7 +147,7 @@ SceneLogic *SceneFactory::createScene(MADSEngine *vm) {
 	case 502:	// push panel trap
 		return new Scene502(vm);
 	case 504:	// Phantom's hideout, church organ
-		return new DummyScene(vm);	// TODO
+		return new Scene504(vm);
 	case 505:	// Phantom's hideout, sarcophagus
 		return new DummyScene(vm);	// TODO
 	case 506:	// catacomb room with ramp

diff --git a/engines/mads/phantom/phantom_scenes.h b/engines/mads/phantom/phantom_scenes.h
@@ -71,6 +71,8 @@ enum Verb {
 	VERB_WALK_BEHIND = 0xF3,
 	VERB_CLIMB = 0x120,
 	VERB_GRAPPLE = 0x133,
+	VERB_SIT_ON = 0x138,
+	VERB_SIT_IN = 0x13A,
 	VERB_WALK_DOWN_STAIRS_TO = 0x153
 };
 
@@ -350,9 +352,7 @@ enum Noun {
 	NOUN_ORGAN = 0x135,
 	NOUN_SIT_AT = 0x136,
 	NOUN_ORGAN_BENCH = 0x137,
-	NOUN_SIT_ON = 0x138,
 	NOUN_LARGE_CHAIR = 0x139,
-	NOUN_SIT_IN = 0x13A,
 	NOUN_SARCOPHAGUS = 0x13B,
 	NOUN_SKULL = 0x13C,
 	NOUN_SKULLS = 0x13D,