diff options
author | Strangerke | 2014-03-16 18:32:46 +0100 |
---|---|---|
committer | Strangerke | 2014-03-16 18:32:46 +0100 |
commit | 834cf846f14ac613b96a662b9701380e7a132d9b (patch) | |
tree | 0b26ed3e3ef5854d4d14c71704d3ef5b5077d098 | |
parent | ecbe2c87fde0b3f5d8264d4e56426cb5f73521a5 (diff) | |
download | scummvm-rg350-834cf846f14ac613b96a662b9701380e7a132d9b.tar.gz scummvm-rg350-834cf846f14ac613b96a662b9701380e7a132d9b.tar.bz2 scummvm-rg350-834cf846f14ac613b96a662b9701380e7a132d9b.zip |
MADS: Implement Scene201::setup, remove some function definition, add some Noun enum values
-rw-r--r-- | engines/mads/nebular/nebular_scenes.h | 5 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes2.cpp | 13 | ||||
-rw-r--r-- | engines/mads/nebular/nebular_scenes2.h | 2 |
3 files changed, 11 insertions, 9 deletions
diff --git a/engines/mads/nebular/nebular_scenes.h b/engines/mads/nebular/nebular_scenes.h index 5b7dd6a726..6021e6715a 100644 --- a/engines/mads/nebular/nebular_scenes.h +++ b/engines/mads/nebular/nebular_scenes.h @@ -39,6 +39,7 @@ enum { }; enum Noun { + NOUN_D = 0xD, NOUN_BLOWGUN = 0x29, NOUN_BURGER = 0x35, NOUN_CHAIR = 0x47, @@ -76,6 +77,7 @@ enum Noun { NOUN_SIT_IN = 0x13F, NOUN_SMELL = 0x147, NOUN_STUFFED_FISH = 0x157, + NOUN_15F = 0x15F, NOUN_VIEW_SCREEN = 0x180, NOUN_CAPTIVE_CREATURE = 0x1C3, NOUN_NATIVE_WOMAN = 0x1DC, @@ -83,7 +85,8 @@ enum Noun { NOUN_DOLLOP = 0x3AC, NOUN_DROP = 0x3AD, NOUN_DASH = 0x3AE, - NOUN_SPLASH = 0x3AF + NOUN_SPLASH = 0x3AF, + NOUN_487 = 0x487 }; class SceneFactory { diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp index 062ea93487..ec8af4ca29 100644 --- a/engines/mads/nebular/nebular_scenes2.cpp +++ b/engines/mads/nebular/nebular_scenes2.cpp @@ -69,6 +69,13 @@ void Scene2xx::setPlayerSpritesPrefix() { } void Scene201::setup() { + setPlayerSpritesPrefix(); + setAAName(); + + Scene &scene = _vm->_game->_scene; + scene.addActiveVocab(NOUN_15F); + scene.addActiveVocab(NOUN_487); + scene.addActiveVocab(NOUN_D); } void Scene201::enter() { @@ -77,14 +84,8 @@ void Scene201::enter() { void Scene201::step() { } -void Scene201::preActions() { -} - void Scene201::actions() { } -void Scene201::postActions() { -} - } // End of namespace Nebular } // End of namespace MADS diff --git a/engines/mads/nebular/nebular_scenes2.h b/engines/mads/nebular/nebular_scenes2.h index 32da9ea79a..c4de73192f 100644 --- a/engines/mads/nebular/nebular_scenes2.h +++ b/engines/mads/nebular/nebular_scenes2.h @@ -53,9 +53,7 @@ public: virtual void setup(); virtual void enter(); virtual void step(); - virtual void preActions(); virtual void actions(); - virtual void postActions(); }; } // End of namespace Nebular |