diff options
author | Willem Jan Palenstijn | 2015-07-22 22:37:40 +0200 |
---|---|---|
committer | Willem Jan Palenstijn | 2015-07-22 22:43:42 +0200 |
commit | 6ec9c81b575f13b2c4b30aeac592ebf2557b5890 (patch) | |
tree | 503d50902bad2d800165593039d08d5ccf0c98ab /engines/mads/phantom/phantom_scenes.h | |
parent | 5ec05f6b647c5ea41418be7ed19ad381f97cabd8 (diff) | |
parent | 4e5c8d35f7e133e2e72a846fdbd54900c91eeb73 (diff) | |
download | scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.gz scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.tar.bz2 scummvm-rg350-6ec9c81b575f13b2c4b30aeac592ebf2557b5890.zip |
Merge branch 'master' into mm
Conflicts:
engines/access/access.cpp
engines/access/asurface.h
engines/access/bubble_box.cpp
engines/access/bubble_box.h
engines/access/martian/martian_game.cpp
engines/access/player.cpp
engines/access/player.h
engines/access/resources.cpp
engines/access/screen.cpp
engines/access/screen.h
engines/access/sound.cpp
engines/access/sound.h
Diffstat (limited to 'engines/mads/phantom/phantom_scenes.h')
-rw-r--r-- | engines/mads/phantom/phantom_scenes.h | 84 |
1 files changed, 33 insertions, 51 deletions
diff --git a/engines/mads/phantom/phantom_scenes.h b/engines/mads/phantom/phantom_scenes.h index cd295a28b6..c0a823ae06 100644 --- a/engines/mads/phantom/phantom_scenes.h +++ b/engines/mads/phantom/phantom_scenes.h @@ -8,12 +8,12 @@ * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -34,20 +34,40 @@ namespace MADS { namespace Phantom { +enum Verb { + VERB_LOOK = 0x3, + VERB_TAKE = 0x4, + VERB_PUSH = 0x5, + VERB_OPEN = 0x6, + VERB_PUT = 0x7, + VERB_TALK_TO = 0x8, + VERB_GIVE = 0x9, + VERB_PULL = 0xA, + VERB_CLOSE = 0xB, + VERB_THROW = 0xC, + VERB_WALK_TO = 0xD, + VERB_CLIMB_DOWN = 0x21, + VERB_CLIMB_INTO = 0x22, + VERB_CLIMB_THROUGH = 0x23, + VERB_EXIT_TO = 0x37, + VERB_JUMP_INTO = 0x53, + VERB_LOOK_AT = 0x60, + VERB_LOOK_THROUGH = 0x61, + VERB_TURN_OFF = 0x95, + VERB_TURN_ON = 0x96, + VERB_UNLOCK = 0x97, + VERB_WALK_ACROSS = 0x99, + VERB_WALK_DOWN = 0x9A, + VERB_WALK_THROUGH = 0x9B, + VERB_WALK_UP = 0x9C, + VERB_CLIMB_UP = 0xA5, + VERB_WALK_ONTO = 0xA6, + VERB_WALK = 0xA7 +}; + enum Noun { NOUN_GAME = 0x1, NOUN_QSAVE = 0x2, - NOUN_LOOK = 0x3, - NOUN_TAKE = 0x4, - NOUN_PUSH = 0x5, - NOUN_OPEN = 0x6, - NOUN_PUT = 0x7, - NOUN_TALK_TO = 0x8, - NOUN_GIVE = 0x9, - NOUN_PULL = 0xA, - NOUN_CLOSE = 0xB, - NOUN_THROW = 0xC, - NOUN_WALK_TO = 0xD, NOUN_ = 0xE, NOUN_IN_ONE = 0xF, NOUN_IN_TWO = 0x10, @@ -67,9 +87,6 @@ enum Noun { NOUN_CEILING = 0x1E, NOUN_CHAIR = 0x1F, NOUN_CIRCULAR_STAIRCASE = 0x20, - NOUN_CLIMB_DOWN = 0x21, - NOUN_CLIMB_INTO = 0x22, - NOUN_CLIMB_THROUGH = 0x23, NOUN_COLUMN_PROP = 0x24, NOUN_CONDUCTORS_STAND = 0x25, NOUN_CORRIDOR = 0x26, @@ -89,7 +106,6 @@ enum Noun { NOUN_EXIT = 0x34, NOUN_EXIT_DOWN = 0x35, NOUN_EXIT_SIGN = 0x36, - NOUN_EXIT_TO = 0x37, NOUN_EXIT_TO_BACKSTAGE = 0x38, NOUN_EXIT_TO_CELLAR = 0x39, NOUN_EXIT_TO_CORRIDOR = 0x3A, @@ -117,7 +133,6 @@ enum Noun { NOUN_HOUSE = 0x50, NOUN_IN_ONE2 = 0x51, NOUN_IN_TWO2 = 0x52, - NOUN_JUMP_INTO = 0x53, NOUN_JUNK = 0x54, NOUN_KEY = 0x55, NOUN_LAMP = 0x56, @@ -130,8 +145,6 @@ enum Noun { NOUN_LOCK = 0x5D, NOUN_LOCKING_RAIL = 0x5E, NOUN_LOCKRAIL = 0x5F, - NOUN_LOOK_AT = 0x60, - NOUN_LOOK_THROUGH = 0x61, NOUN_MANNEQUINS = 0x62, NOUN_MIRROR = 0x63, NOUN_MUMMY_PROP = 0x64, @@ -183,14 +196,7 @@ enum Noun { NOUN_TICKET = 0x92, NOUN_TRAP_CEILING = 0x93, NOUN_TRAP_DOOR = 0x94, - NOUN_TURN_OFF = 0x95, - NOUN_TURN_ON = 0x96, - NOUN_UNLOCK = 0x97, NOUN_URN = 0x98, - NOUN_WALK_ACROSS = 0x99, - NOUN_WALK_DOWN = 0x9A, - NOUN_WALK_THROUGH = 0x9B, - NOUN_WALK_UP = 0x9C, NOUN_WALL = 0x9D, NOUN_WARDROBE = 0x9E, NOUN_WASTE_BASKET = 0x9F, @@ -199,9 +205,6 @@ enum Noun { NOUN_WEDDING_RING = 0xA2, NOUN_YELLOW_FRAME = 0xA3, NOUN_PROP = 0xA4, - NOUN_CLIMB_UP = 0xA5, - NOUN_WALK_ONTO = 0xA6, - NOUN_WALK = 0xA7, NOUN_LEFT_DOOR = 0xA8, NOUN_RIGHT_DOOR = 0xA9, NOUN_DOOR_TO_PIT = 0xAA, @@ -482,27 +485,6 @@ protected: }; // TODO: Temporary, remove once implemented properly -class Scene1xx : public PhantomScene { -protected: - /** - * Plays an appropriate sound when entering a scene - */ - void sceneEntrySound() {} - - /** - *Sets the AA file to use for the scene - */ - void setAAName() {} - - /** - * Updates the prefix used for getting player sprites for the scene - */ - void setPlayerSpritesPrefix() {} -public: - Scene1xx(MADSEngine *vm) : PhantomScene(vm) {} -}; - -// TODO: Temporary, remove once implemented properly class DummyScene : public PhantomScene { public: DummyScene(MADSEngine *vm) : PhantomScene(vm) { |