diff options
author | Bendegúz Nagy | 2016-06-19 00:54:28 +0200 |
---|---|---|
committer | Bendegúz Nagy | 2016-08-26 23:02:22 +0200 |
commit | 23c1acff1939b8feb4bcbbf04bc44ca00321547d (patch) | |
tree | 170cd5d6621105ca06abfadeeb56e91ae9da1011 | |
parent | 359ef01a338e9571101baac2ddb82032ca6a1cc7 (diff) | |
download | scummvm-rg350-23c1acff1939b8feb4bcbbf04bc44ca00321547d.tar.gz scummvm-rg350-23c1acff1939b8feb4bcbbf04bc44ca00321547d.tar.bz2 scummvm-rg350-23c1acff1939b8feb4bcbbf04bc44ca00321547d.zip |
DM: Add ObjectMan to DMEngine
-rw-r--r-- | engines/dm/dm.cpp | 4 | ||||
-rw-r--r-- | engines/dm/dm.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/engines/dm/dm.cpp b/engines/dm/dm.cpp index 4408eb4993..af0868d061 100644 --- a/engines/dm/dm.cpp +++ b/engines/dm/dm.cpp @@ -18,6 +18,7 @@ #include "menus.h" #include "champion.h" #include "loadsave.h" +#include "objectman.h" namespace DM { @@ -49,6 +50,7 @@ DMEngine::DMEngine(OSystem *syst) : Engine(syst), _console(nullptr) { _menuMan = nullptr; _championMan = nullptr; _loadsaveMan = nullptr; + _objectMan = nullptr; _stopWaitingForPlayerInput = false; _gameTimeTicking = false; @@ -67,6 +69,7 @@ DMEngine::~DMEngine() { delete _menuMan; delete _championMan; delete _loadsaveMan; + delete _objectMan; // clear debug channels DebugMan.clearAllDebugChannels(); @@ -142,6 +145,7 @@ Common::Error DMEngine::run() { _menuMan = new MenuMan(this); _championMan = new ChampionMan(this); _loadsaveMan = new LoadsaveMan(this); + _objectMan = new ObjectMan(this); _displayMan->setUpScreens(320, 200); initializeGame(); // @ F0463_START_InitializeGame_CPSADEF diff --git a/engines/dm/dm.h b/engines/dm/dm.h index 468cd5c528..14a8772dba 100644 --- a/engines/dm/dm.h +++ b/engines/dm/dm.h @@ -15,6 +15,7 @@ class EventManager; class MenuMan; class ChampionMan; class LoadsaveMan; +class ObjectMan; enum direction { @@ -99,6 +100,7 @@ public: MenuMan *_menuMan; ChampionMan *_championMan; LoadsaveMan *_loadsaveMan; + ObjectMan *_objectMan; bool _stopWaitingForPlayerInput; // G0321_B_StopWaitingForPlayerInput bool _gameTimeTicking; // @ G0301_B_GameTimeTicking bool _restartGameAllowed; // @ G0524_B_RestartGameAllowed |