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

[m_kiewitz at users.sourceforge.net]

Revision: 51281
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51281&view=rev
Author:   m_kiewitz
Date:     2010-07-25 19:47:12 +0000 (Sun, 25 Jul 2010)

Log Message:
-----------
SCI: some changes for kq7
- resetting negative plane left/top
- kSave(0) returns SIGNAL

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kfile.cpp
    scummvm/trunk/engines/sci/graphics/frameout.cpp

Modified: scummvm/trunk/engines/sci/engine/kfile.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kfile.cpp	2010-07-25 19:28:58 UTC (rev 51280)
+++ scummvm/trunk/engines/sci/engine/kfile.cpp	2010-07-25 19:47:12 UTC (rev 51281)
@@ -966,6 +966,8 @@
 
 reg_t kSave(EngineState *s, int argc, reg_t *argv) {
 	switch (argv[0].toUint16()) {
+	case 0: // Called by kq7 when starting chapters
+		return SIGNAL_REG;
 	case 2: // GetSaveDir
 		// Yay! Reusing the old kernel function!
 		return kGetSaveDir(s, argc - 1, argv + 1);

Modified: scummvm/trunk/engines/sci/graphics/frameout.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/frameout.cpp	2010-07-25 19:28:58 UTC (rev 51280)
+++ scummvm/trunk/engines/sci/graphics/frameout.cpp	2010-07-25 19:47:12 UTC (rev 51281)
@@ -188,6 +188,11 @@
 		planeRect.bottom = (planeRect.bottom * _screen->getHeight()) / scriptsRunningHeight;
 		planeRect.right = (planeRect.right * _screen->getWidth()) / scriptsRunningWidth;
 
+		// We get negative left in kq7 in scrolling rooms
+		if (planeRect.left < 0)
+			planeRect.left = 0;
+		if (planeRect.top < 0)
+			planeRect.top = 0;
 		// We get bad plane-bottom in sq6
 		if (planeRect.right > _screen->getWidth())
 			planeRect.right = _screen->getWidth();


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