[Scummvm-cvs-logs] SF.net SVN: scummvm:[44987] scummvm/trunk/engines/sci/engine/kgraphics.cpp

m_kiewitz at users.sourceforge.net m_kiewitz at users.sourceforge.net
Mon Oct 12 17:13:15 CEST 2009


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

Log Message:
-----------
SCI: kCelHigh / kCelWide got broken with last revision, now fixed

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

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-10-12 13:10:25 UTC (rev 44986)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-10-12 15:13:15 UTC (rev 44987)
@@ -794,11 +794,11 @@
 reg_t kCelHigh(EngineState *s, int argc, reg_t *argv) {
 	int view = argv[0].toSint16();
 	int loop = argv[1].toSint16();
-	int cel = (argc > 3) ? argv[2].toSint16() : 0;
+	int cel = (argc >= 3) ? argv[2].toSint16() : 0;
 	int height, width;
 	Common::Point offset;
 
-	if (argc > 4)
+	if (argc > 3)
 		error("celHigh called with more than 3 parameters");
 
 	gfxop_get_cel_parameters(s->gfx_state, view, loop, cel, &width, &height, &offset);
@@ -808,11 +808,11 @@
 reg_t kCelWide(EngineState *s, int argc, reg_t *argv) {
 	int view = argv[0].toSint16();
 	int loop = argv[1].toSint16();
-	int cel = (argc > 3) ? argv[2].toSint16() : 0;
+	int cel = (argc >= 3) ? argv[2].toSint16() : 0;
 	int height, width;
 	Common::Point offset;
 
-	if (argc > 4)
+	if (argc > 3)
 		error("celWide called with more than 3 parameters");
 
 	gfxop_get_cel_parameters(s->gfx_state, view, loop, cel, &width, &height, &offset);


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