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

[m_kiewitz at users.sourceforge.net]

Revision: 47889
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47889&view=rev
Author:   m_kiewitz
Date:     2010-02-04 20:52:56 +0000 (Thu, 04 Feb 2010)

Log Message:
-----------
SCI: kPicNotValid now uses GfxScreen directly and not SciGui/32

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.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

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-02-04 20:43:00 UTC (rev 47888)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-02-04 20:52:56 UTC (rev 47889)
@@ -215,7 +215,7 @@
 reg_t kPicNotValid(EngineState *s, int argc, reg_t *argv) {
 	int16 newPicNotValid = (argc > 0) ? argv[0].toUint16() : -1;
 
-	return make_reg(0, s->_gui->picNotValid(newPicNotValid));
+	return make_reg(0, s->_gfxScreen->kernelPicNotValid(newPicNotValid));
 }
 
 Common::Rect kGraphCreateRect(int16 x, int16 y, int16 x1, int16 y1) {

Modified: scummvm/trunk/engines/sci/graphics/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.cpp	2010-02-04 20:43:00 UTC (rev 47888)
+++ scummvm/trunk/engines/sci/graphics/gui.cpp	2010-02-04 20:52:56 UTC (rev 47889)
@@ -296,25 +296,6 @@
 	}
 }
 
-int16 SciGui::picNotValid(int16 newPicNotValid) {
-	int16 oldPicNotValid;
-
-	if (getSciVersion() >= SCI_VERSION_1_1) {
-		oldPicNotValid = _screen->_picNotValidSci11;
-
-		if (newPicNotValid != -1)
-			_screen->_picNotValidSci11 = newPicNotValid;
-	} else {
-		oldPicNotValid = _screen->_picNotValid;
-
-		if (newPicNotValid != -1)
-			_screen->_picNotValid = newPicNotValid;
-	}
-
-	return oldPicNotValid;
-}
-
-
 void SciGui::shakeScreen(uint16 shakeCount, uint16 directions) {
 	while (shakeCount--) {
 		if (directions & SCI_SHAKE_DIRECTION_VERTICAL)

Modified: scummvm/trunk/engines/sci/graphics/gui.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.h	2010-02-04 20:43:00 UTC (rev 47888)
+++ scummvm/trunk/engines/sci/graphics/gui.h	2010-02-04 20:52:56 UTC (rev 47889)
@@ -79,8 +79,6 @@
 	virtual void graphRedrawBox(Common::Rect rect);
 	virtual void graphAdjustPriority(int top, int bottom);
 
-	virtual int16 picNotValid(int16 newPicNotValid);
-
 	virtual void shakeScreen(uint16 shakeCount, uint16 directions);
 
 	virtual uint16 onControl(byte screenMask, Common::Rect rect);

Modified: scummvm/trunk/engines/sci/graphics/screen.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/screen.cpp	2010-02-04 20:43:00 UTC (rev 47888)
+++ scummvm/trunk/engines/sci/graphics/screen.cpp	2010-02-04 20:52:56 UTC (rev 47889)
@@ -526,4 +526,22 @@
 	}
 }
 
+int16 GfxScreen::kernelPicNotValid(int16 newPicNotValid) {
+	int16 oldPicNotValid;
+
+	if (getSciVersion() >= SCI_VERSION_1_1) {
+		oldPicNotValid = _picNotValidSci11;
+
+		if (newPicNotValid != -1)
+			_picNotValidSci11 = newPicNotValid;
+	} else {
+		oldPicNotValid = _picNotValid;
+
+		if (newPicNotValid != -1)
+			_picNotValid = newPicNotValid;
+	}
+
+	return oldPicNotValid;
+}
+
 } // End of namespace Sci

Modified: scummvm/trunk/engines/sci/graphics/screen.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/screen.h	2010-02-04 20:43:00 UTC (rev 47888)
+++ scummvm/trunk/engines/sci/graphics/screen.h	2010-02-04 20:52:56 UTC (rev 47889)
@@ -95,6 +95,8 @@
 	int _picNotValid; // possible values 0, 1 and 2
 	int _picNotValidSci11; // another variable that is used by kPicNotValid in sci1.1
 
+	int16 kernelPicNotValid(int16 newPicNotValid);
+
 private:
 	uint16 _width;
 	uint16 _height;


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