diff options
Diffstat (limited to 'engines/mads/dragonsphere/game_dragonsphere.h')
| -rw-r--r-- | engines/mads/dragonsphere/game_dragonsphere.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/engines/mads/dragonsphere/game_dragonsphere.h b/engines/mads/dragonsphere/game_dragonsphere.h index b57f8833c6..b9eb86af64 100644 --- a/engines/mads/dragonsphere/game_dragonsphere.h +++ b/engines/mads/dragonsphere/game_dragonsphere.h @@ -26,7 +26,7 @@ #include "common/scummsys.h" #include "mads/game.h" #include "mads/globals.h" -//#include "mads/nebular/globals_nebular.h" +#include "mads/dragonsphere/globals_dragonsphere.h" namespace MADS { @@ -80,7 +80,7 @@ enum InventoryObject { OBJ_DIAMOND_DUST = 40, OBJ_RUBY_RING = 41, OBJ_GOLD_NUGGET = 42, - OBJ_MUSIC_BOX = 43, + OBJ_MAGIC_MUSIC_BOX = 43, OBJ_EMERALD = 44, OBJ_PARCHMENT = 45, OBJ_GAME = 46, @@ -88,15 +88,6 @@ enum InventoryObject { OBJ_NEW_BUNDLE = 48 }; -// HACK: A stub for now, remove from here once it's implemented properly -class DragonsphereGlobals : public Globals { -public: - DragonsphereGlobals() { - resize(210); // Rex has 210 globals - } - virtual ~DragonsphereGlobals() {} -}; - class GameDragonsphere : public Game { friend class Game; protected: |