diff options
| author | Martin Kiewitz | 2010-01-04 23:17:51 +0000 |
|---|---|---|
| committer | Martin Kiewitz | 2010-01-04 23:17:51 +0000 |
| commit | 01d68c7eafa4e2851076f69976948181da2b297e (patch) | |
| tree | 326610e539849dc290d4c2ca6c77dad78bc34491 /engines/sci | |
| parent | 3767d3a71810c6160cb869211754ead095708e74 (diff) | |
| download | scummvm-rg350-01d68c7eafa4e2851076f69976948181da2b297e.tar.gz scummvm-rg350-01d68c7eafa4e2851076f69976948181da2b297e.tar.bz2 scummvm-rg350-01d68c7eafa4e2851076f69976948181da2b297e.zip | |
SCI: adding #ifdefs for temporary gui work
svn-id: r46997
Diffstat (limited to 'engines/sci')
| -rw-r--r-- | engines/sci/gui/gui.cpp | 4 | ||||
| -rw-r--r-- | engines/sci/gui/gui.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/engines/sci/gui/gui.cpp b/engines/sci/gui/gui.cpp index a9aecc32a8..a477f11595 100644 --- a/engines/sci/gui/gui.cpp +++ b/engines/sci/gui/gui.cpp @@ -66,8 +66,10 @@ SciGui::SciGui(EngineState *state, SciGuiScreen *screen, SciGuiPalette *palette, _menu = new SciGuiMenu(_s->_event, _s->_segMan, _gfx, _text, _screen, _cursor); // _gui32 = new SciGui32(_s, _screen, _palette, _cursor); // for debug purposes +#ifdef ENABLE_SCI32 _screenItemCount = 0; _planeCount = 0; +#endif } SciGui::SciGui() { @@ -840,6 +842,7 @@ uint16 SciGui::getScreenHeight() { return _screen->_displayHeight; } +#ifdef ENABLE_SCI32 void SciGui::addScreenItem(reg_t object) { _screenItems.push_back(object); _screenItemCount++; @@ -922,6 +925,7 @@ void SciGui::frameOut() { } } } +#endif bool SciGui::debugUndither(bool flag) { _screen->unditherSetState(flag); diff --git a/engines/sci/gui/gui.h b/engines/sci/gui/gui.h index 07e8f6df4f..535b71cb49 100644 --- a/engines/sci/gui/gui.h +++ b/engines/sci/gui/gui.h @@ -153,6 +153,7 @@ public: virtual uint16 getScreenWidth(); virtual uint16 getScreenHeight(); +#ifdef ENABLE_SCI32 // SCI32 virtual void addScreenItem(reg_t object); virtual void deleteScreenItem(reg_t object); @@ -160,6 +161,7 @@ public: virtual void updatePlane(reg_t object); virtual void deletePlane(reg_t object); virtual void frameOut(); +#endif virtual bool debugUndither(bool flag); virtual bool debugShowMap(int mapNo); @@ -189,10 +191,12 @@ private: bool _usesOldGfxFunctions; +#ifdef ENABLE_SCI32 Common::Array<reg_t> _screenItems; int _screenItemCount; Common::Array<reg_t> _planes; int _planeCount; +#endif }; } // End of namespace Sci |