From f121349503bdd3076574d11465d7b7acf3d93142 Mon Sep 17 00:00:00 2001 From: uruk Date: Sat, 17 May 2014 22:34:31 +0200 Subject: CGE2: Further implement caveUp(), add stubbed loadMap(). --- engines/cge2/cge2.cpp | 1 + engines/cge2/cge2.h | 3 +++ engines/cge2/cge2_main.cpp | 9 +++++++++ 3 files changed, 13 insertions(+) (limited to 'engines/cge2') diff --git a/engines/cge2/cge2.cpp b/engines/cge2/cge2.cpp index 907ef9a8cd..7bb861dd1d 100644 --- a/engines/cge2/cge2.cpp +++ b/engines/cge2/cge2.cpp @@ -62,6 +62,7 @@ CGE2Engine::CGE2Engine(OSystem *syst, const ADGameDescription *gameDescription) _startupMode = 1; _now = 1; _sex = true; + _mouseTop = kWorldHeight / 3; } void CGE2Engine::init() { diff --git a/engines/cge2/cge2.h b/engines/cge2/cge2.h index bbd709094e..7e92664352 100644 --- a/engines/cge2/cge2.h +++ b/engines/cge2/cge2.h @@ -51,6 +51,7 @@ class CommandHandler; #define kScrWidth 320 #define kScrHeight 240 +#define kScrDepth 480 #define kPanHeight 40 #define kWorldHeight (kScrHeight - kPanHeight) #define kMaxFile 128 @@ -87,6 +88,7 @@ public: void showBak(int ref); void loadTab(); int newRandom(int range); + void loadMap(int cav); void setEye(V3D &e); void setEye(const V2D& e2, int z = -kScrWidth); @@ -109,6 +111,7 @@ public: int _startupMode; int _now; bool _sex; + int _mouseTop; ResourceManager *_resman; Vga *_vga; diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp index ce84b23f2f..9a84220299 100644 --- a/engines/cge2/cge2_main.cpp +++ b/engines/cge2/cge2_main.cpp @@ -335,6 +335,11 @@ void CGE2Engine::caveUp(int cav) { if (_music) _midiPlayer->loadMidi(bakRef); showBak(bakRef); + _eye = _eyeTab[_now]; + _mouseTop = V2D(this, V3D(0, 1, kScrDepth)).y; + loadTab(); + + _vga->update(); warning("STUB: CGE2Engine::caveUp()"); } @@ -351,6 +356,10 @@ void CGE2Engine::showBak(int ref) { } } +void CGE2Engine::loadMap(int cav) { + warning("STUB: CGE2Engine::loadMap()"); +} + void CGE2Engine::runGame() { warning("STUB: CGE2Engine::runGame()"); } -- cgit v1.2.3