From 14e3df21ef1a1cc3e3c599605cd84faf353a2e6f Mon Sep 17 00:00:00 2001 From: uruk Date: Mon, 26 May 2014 09:37:52 +0200 Subject: CGE2: Add stub for System. --- engines/cge2/cge2.cpp | 3 +++ engines/cge2/cge2.h | 2 ++ engines/cge2/cge2_main.cpp | 12 ++++++++++++ engines/cge2/cge2_main.h | 14 ++++++++++++++ 4 files changed, 31 insertions(+) diff --git a/engines/cge2/cge2.cpp b/engines/cge2/cge2.cpp index 7c4d1f13c8..18016ec561 100644 --- a/engines/cge2/cge2.cpp +++ b/engines/cge2/cge2.cpp @@ -63,6 +63,7 @@ CGE2Engine::CGE2Engine(OSystem *syst, const ADGameDescription *gameDescription) _talk = nullptr; for (int i = 0; i < kMaxPoint; i++) _point[i] = nullptr; + _sys = nullptr; _quitFlag = false; _bitmapPalette = nullptr; @@ -101,6 +102,7 @@ void CGE2Engine::init() { _keyboard = new Keyboard(this); for (int i = 0; i < kMaxPoint; i++) _point[i] = new V3D(); + _sys = new System(this); } void CGE2Engine::deinit() { @@ -131,6 +133,7 @@ void CGE2Engine::deinit() { for (int i = 0; i < kMaxPoint; i++) { delete _point[i]; } + delete _sys; } bool CGE2Engine::hasFeature(EngineFeature f) const { diff --git a/engines/cge2/cge2.h b/engines/cge2/cge2.h index d067e40153..5275fa7bc8 100644 --- a/engines/cge2/cge2.h +++ b/engines/cge2/cge2.h @@ -54,6 +54,7 @@ class Keyboard; class Talk; class Hero; class Bitmap; +class System; #define kScrWidth 320 #define kScrHeight 240 @@ -217,6 +218,7 @@ public: Keyboard *_keyboard; Talk *_talk; V3D *_point[kMaxPoint]; + System *_sys; private: void init(); void deinit(); diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp index cf4b4fd66d..501fa594cf 100644 --- a/engines/cge2/cge2_main.cpp +++ b/engines/cge2/cge2_main.cpp @@ -37,6 +37,18 @@ namespace CGE2 { +System::System(CGE2Engine *vm) : Sprite(vm), _vm(vm) { + warning("STUB: System::System()"); +} + +void System::touch(uint16 mask, int x, int y, Common::KeyCode keyCode) { + warning("STUB: System::touch()"); +} + +void System::tick() { + warning("STUB: System::tick()"); +} + int CGE2Engine::number(char *s) { // TODO: Rework it later to include the preceding token() call! int r = atoi(s); char *pp = strchr(s, ':'); diff --git a/engines/cge2/cge2_main.h b/engines/cge2/cge2_main.h index 96966975a3..7146e43115 100644 --- a/engines/cge2/cge2_main.h +++ b/engines/cge2/cge2_main.h @@ -39,6 +39,20 @@ namespace CGE2 { #define kGameFrameDelay (750 / 50) #define kGameTickDelay (750 / 62) +class System : public Sprite { +public: + int _funDel; + int _blinkCounter; + Sprite *_blinkSprite; + + System(CGE2Engine *vm); + + virtual void touch(uint16 mask, int x, int y, Common::KeyCode keyCode); + void tick(); +private: + CGE2Engine *_vm; +}; + } // End of namespace CGE2 #endif // CGE2_MAIN_H -- cgit v1.2.3