aboutsummaryrefslogtreecommitdiff
path: root/engines/dm/dm.h
diff options
context:
space:
mode:
authorBendegúz Nagy2016-08-10 11:10:56 +0200
committerBendegúz Nagy2016-08-26 23:02:22 +0200
commit50c5b39887288b34fd5c9eb25ade633bf43dff4d (patch)
tree4ecd79bb29fb35c071dfc021991dc2aa49c8f935 /engines/dm/dm.h
parent1be1728c951e4f81755e870e7a95811a85351fd4 (diff)
downloadscummvm-rg350-50c5b39887288b34fd5c9eb25ade633bf43dff4d.tar.gz
scummvm-rg350-50c5b39887288b34fd5c9eb25ade633bf43dff4d.tar.bz2
scummvm-rg350-50c5b39887288b34fd5c9eb25ade633bf43dff4d.zip
DM: Add debugger console
Diffstat (limited to 'engines/dm/dm.h')
-rw-r--r--engines/dm/dm.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/engines/dm/dm.h b/engines/dm/dm.h
index d254f3d95a..ae16e13e60 100644
--- a/engines/dm/dm.h
+++ b/engines/dm/dm.h
@@ -30,16 +30,16 @@
#include "common/random.h"
#include "engines/engine.h"
-#include "gui/debugger.h"
#include "common/savefile.h"
#include "common/str.h"
#include "engines/savestate.h"
+#include "console.h"
+
namespace DM {
-class Console;
class DisplayMan;
class DungeonMan;
class EventManager;
@@ -241,6 +241,7 @@ public:
explicit DMEngine(OSystem *syst);
~DMEngine();
virtual bool hasFeature(EngineFeature f) const;
+ GUI::Debugger *getDebugger() { return _console; }
void f22_delay(uint16 verticalBlank); // @ F0022_MAIN_Delay
uint16 f30_getScaledProduct(uint16 val, uint16 scale, uint16 vale2); // @ F0030_MAIN_GetScaledProduct
@@ -266,7 +267,6 @@ private:
int16 _g528_saveFormat; // @ G0528_i_Format
int16 _g527_platform; // @ G0527_i_Platform
uint16 _g526_dungeonId; // @ G0526_ui_DungeonID
- Console *_console;
byte *_g562_entranceDoorAnimSteps[10]; // @ G0562_apuc_Bitmap_EntranceDoorAnimationSteps
byte *_g564_interfaceCredits; // @ G0564_puc_Graphic5_InterfaceCredits
Common::RandomSource *_rnd;
@@ -274,6 +274,7 @@ private:
Common::Queue<PendingSound> _pendingSounds;
byte *_savedScreenForOpenEntranceDoors; // ad-hoc HACK
public:
+ Console *_console;
DisplayMan *_displayMan;
DungeonMan *_dungeonMan;
EventManager *_eventMan;
@@ -317,12 +318,6 @@ public:
int16 _g318_waitForInputMaxVerticalBlankCount; // @ G0318_i_WaitForInputMaximumVerticalBlankCount
};
-class Console : public GUI::Debugger {
-public:
- explicit Console(DMEngine *vm) {}
- virtual ~Console(void) {}
-};
-
} // End of namespace DM
#endif