[Scummvm-cvs-logs] SF.net SVN: scummvm:[47905] scummvm/trunk/engines/sci
m_kiewitz at users.sourceforge.net
m_kiewitz at users.sourceforge.net
Fri Feb 5 16:53:37 CET 2010
Revision: 47905
http://scummvm.svn.sourceforge.net/scummvm/?rev=47905&view=rev
Author: m_kiewitz
Date: 2010-02-05 15:53:36 +0000 (Fri, 05 Feb 2010)
Log Message:
-----------
SCI: screen specific debug functions are now called directly w/o SciGui/32
Modified Paths:
--------------
scummvm/trunk/engines/sci/console.cpp
scummvm/trunk/engines/sci/graphics/gui.cpp
scummvm/trunk/engines/sci/graphics/gui.h
scummvm/trunk/engines/sci/graphics/screen.cpp
scummvm/trunk/engines/sci/graphics/screen.h
scummvm/trunk/engines/sci/sci.cpp
Modified: scummvm/trunk/engines/sci/console.cpp
===================================================================
--- scummvm/trunk/engines/sci/console.cpp 2010-02-05 15:48:45 UTC (rev 47904)
+++ scummvm/trunk/engines/sci/console.cpp 2010-02-05 15:53:36 UTC (rev 47905)
@@ -1121,8 +1121,8 @@
}
bool flag = atoi(argv[1]) ? true : false;
-
- return _engine->_gamestate->_gui->debugUndither(flag);
+ _engine->_gamestate->_gfxScreen->debugUnditherSetState(flag);
+ return false;
}
bool Console::cmdPicVisualize(int argc, const char **argv) {
@@ -1421,7 +1421,7 @@
case 1:
case 2:
case 3:
- return _engine->_gamestate->_gui->debugShowMap(map);
+ _engine->_gamestate->_gfxScreen->debugShowMap(map);
break;
default:
Modified: scummvm/trunk/engines/sci/graphics/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.cpp 2010-02-05 15:48:45 UTC (rev 47904)
+++ scummvm/trunk/engines/sci/graphics/gui.cpp 2010-02-05 15:53:36 UTC (rev 47905)
@@ -439,16 +439,6 @@
void SciGui::portraitUnload(uint16 portraitId) {
}
-bool SciGui::debugUndither(bool flag) {
- _screen->unditherSetState(flag);
- return false;
-}
-
-bool SciGui::debugShowMap(int mapNo) {
- _screen->debugShowMap(mapNo);
- return false;
-}
-
bool SciGui::debugEGAdrawingVisualize(bool state) {
_paint16->setEGAdrawingVisualize(state);
return false;
Modified: scummvm/trunk/engines/sci/graphics/gui.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.h 2010-02-05 15:48:45 UTC (rev 47904)
+++ scummvm/trunk/engines/sci/graphics/gui.h 2010-02-05 15:53:36 UTC (rev 47905)
@@ -95,8 +95,6 @@
virtual void portraitShow(Common::String resourceName, Common::Point position, uint16 resourceNum, uint16 noun, uint16 verb, uint16 cond, uint16 seq);
virtual void portraitUnload(uint16 portraitId);
- virtual bool debugUndither(bool flag);
- virtual bool debugShowMap(int mapNo);
virtual bool debugEGAdrawingVisualize(bool state);
// FIXME: Don't store EngineState
Modified: scummvm/trunk/engines/sci/graphics/screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/screen.cpp 2010-02-05 15:48:45 UTC (rev 47904)
+++ scummvm/trunk/engines/sci/graphics/screen.cpp 2010-02-05 15:53:36 UTC (rev 47905)
@@ -484,7 +484,7 @@
}
}
-void GfxScreen::unditherSetState(bool flag) {
+void GfxScreen::debugUnditherSetState(bool flag) {
_unditherState = flag;
}
Modified: scummvm/trunk/engines/sci/graphics/screen.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/screen.h 2010-02-05 15:48:45 UTC (rev 47904)
+++ scummvm/trunk/engines/sci/graphics/screen.h 2010-02-05 15:53:36 UTC (rev 47905)
@@ -92,7 +92,7 @@
void scale2x(byte *src, byte *dst, int16 srcWidth, int16 srcHeight);
void dither(bool addToFlag);
- void unditherSetState(bool flag);
+ void debugUnditherSetState(bool flag);
int16 *unditherGetMemorial();
void debugShowMap(int mapNo);
Modified: scummvm/trunk/engines/sci/sci.cpp
===================================================================
--- scummvm/trunk/engines/sci/sci.cpp 2010-02-05 15:48:45 UTC (rev 47904)
+++ scummvm/trunk/engines/sci/sci.cpp 2010-02-05 15:53:36 UTC (rev 47905)
@@ -221,7 +221,7 @@
_gamestate->_soundCmd = new SoundCommandParser(_resMan, segMan, _kernel, _audio, soundVersion);
- screen->unditherSetState(ConfMan.getBool("undither"));
+ screen->debugUnditherSetState(ConfMan.getBool("undither"));
#ifdef USE_OLD_MUSIC_FUNCTIONS
if (game_init_sound(_gamestate, 0, soundVersion)) {
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