[Scummvm-cvs-logs] SF.net SVN: scummvm:[46997] scummvm/trunk/engines/sci/gui
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Tue Jan 5 00:17:51 CET 2010
Revision: 46997
http://scummvm.svn.sourceforge.net/scummvm/?rev=46997&view=rev
Author: m_kiewitz
Date: 2010-01-04 23:17:51 +0000 (Mon, 04 Jan 2010)
Log Message:
-----------
SCI: adding #ifdefs for temporary gui work
Modified Paths:
--------------
scummvm/trunk/engines/sci/gui/gui.cpp
scummvm/trunk/engines/sci/gui/gui.h
Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp 2010-01-04 23:09:57 UTC (rev 46996)
+++ scummvm/trunk/engines/sci/gui/gui.cpp 2010-01-04 23:17:51 UTC (rev 46997)
@@ -66,8 +66,10 @@
_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 @@
return _screen->_displayHeight;
}
+#ifdef ENABLE_SCI32
void SciGui::addScreenItem(reg_t object) {
_screenItems.push_back(object);
_screenItemCount++;
@@ -922,6 +925,7 @@
}
}
}
+#endif
bool SciGui::debugUndither(bool flag) {
_screen->unditherSetState(flag);
Modified: scummvm/trunk/engines/sci/gui/gui.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.h 2010-01-04 23:09:57 UTC (rev 46996)
+++ scummvm/trunk/engines/sci/gui/gui.h 2010-01-04 23:17:51 UTC (rev 46997)
@@ -153,6 +153,7 @@
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 @@
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 @@
bool _usesOldGfxFunctions;
+#ifdef ENABLE_SCI32
Common::Array<reg_t> _screenItems;
int _screenItemCount;
Common::Array<reg_t> _planes;
int _planeCount;
+#endif
};
} // End of namespace Sci
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list