[Scummvm-cvs-logs] SF.net SVN: scummvm:[44968] scummvm/trunk/engines/sci

[m_kiewitz at users.sourceforge.net]

Revision: 44968
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44968&view=rev
Author:   m_kiewitz
Date:     2009-10-12 07:30:55 +0000 (Mon, 12 Oct 2009)

Log Message:
-----------
SCI/newgui: implemented kPicNotValid

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/gui/gui.cpp
    scummvm/trunk/engines/sci/gui/gui.h
    scummvm/trunk/engines/sci/gui32/gui32.cpp
    scummvm/trunk/engines/sci/gui32/gui32.h

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-10-12 07:18:38 UTC (rev 44967)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-10-12 07:30:55 UTC (rev 44968)
@@ -580,11 +580,9 @@
 }
 
 reg_t kPicNotValid(EngineState *s, int argc, reg_t *argv) {
-	s->r_acc = make_reg(0, s->pic_not_valid);
-	if (argc)
-		s->pic_not_valid = (byte)argv[0].toUint16();
+	int16 newPicNotValid = (argc > 0) ? argv[0].toUint16() : -1;
 
-	return s->r_acc;
+	return make_reg(0, s->_gui->picNotValid(newPicNotValid));
 }
 
 reg_t kGraph(EngineState *s, int argc, reg_t *argv) {

Modified: scummvm/trunk/engines/sci/gui/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-12 07:18:38 UTC (rev 44967)
+++ scummvm/trunk/engines/sci/gui/gui.cpp	2009-10-12 07:30:55 UTC (rev 44968)
@@ -433,7 +433,16 @@
 	_gfx->BitsShow(rect);
 }
 
+int16 SciGui::picNotValid(int16 newPicNotValid) {
+	int16 oldPicNotValid = _screen->_picNotValid;
 
+	if (newPicNotValid != -1)
+		_screen->_picNotValid = newPicNotValid;
+
+	return oldPicNotValid;
+}
+
+
 void SciGui::paletteSet(int resourceNo, int flags) {
    _palette->setFromResource(resourceNo, flags);
 }

Modified: scummvm/trunk/engines/sci/gui/gui.h
===================================================================
--- scummvm/trunk/engines/sci/gui/gui.h	2009-10-12 07:18:38 UTC (rev 44967)
+++ scummvm/trunk/engines/sci/gui/gui.h	2009-10-12 07:30:55 UTC (rev 44968)
@@ -84,6 +84,8 @@
 	virtual void graphRestoreBox(reg_t handle);
 	virtual void graphUpdateBox(Common::Rect rect);
 
+	virtual int16 picNotValid(int16 newPicNotValid);
+
 	virtual void paletteSet(int resourceNo, int flags);
 	virtual int16 paletteFind(int r, int g, int b);
 	virtual void paletteSetIntensity(int fromColor, int toColor, int intensity, bool setPalette);

Modified: scummvm/trunk/engines/sci/gui32/gui32.cpp
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.cpp	2009-10-12 07:18:38 UTC (rev 44967)
+++ scummvm/trunk/engines/sci/gui32/gui32.cpp	2009-10-12 07:30:55 UTC (rev 44968)
@@ -961,6 +961,15 @@
 	gfxop_update_box(s->gfx_state, area);
 }
 
+int16 SciGui32::picNotValid(int16 newPicNotValid) {
+	int16 oldPicNotValid = s->pic_not_valid;
+
+	if (newPicNotValid != -1)
+		s->pic_not_valid = newPicNotValid;
+
+	return oldPicNotValid;
+}
+
 void SciGui32::paletteSet(int resourceNo, int flags) {
 	//warning("STUB");
 }

Modified: scummvm/trunk/engines/sci/gui32/gui32.h
===================================================================
--- scummvm/trunk/engines/sci/gui32/gui32.h	2009-10-12 07:18:38 UTC (rev 44967)
+++ scummvm/trunk/engines/sci/gui32/gui32.h	2009-10-12 07:30:55 UTC (rev 44968)
@@ -75,6 +75,8 @@
 	void graphRestoreBox(reg_t handle);
 	void graphUpdateBox(Common::Rect);
 
+	int16 picNotValid(int16 newPicNotValid);
+
 	void paletteSet(int resourceNo, int flags);
 	int16 paletteFind(int r, int g, int b);
 	void paletteSetIntensity(int fromColor, int toColor, int intensity, bool setPalette);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.