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

[m_kiewitz at users.sourceforge.net]

Revision: 47308
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47308&view=rev
Author:   m_kiewitz
Date:     2010-01-15 15:37:40 +0000 (Fri, 15 Jan 2010)

Log Message:
-----------
SCI: adjust kNewWindow to support argc==15 (on mac according [md5])

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

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-01-15 15:30:40 UTC (rev 47307)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2010-01-15 15:37:40 UTC (rev 47308)
@@ -932,14 +932,14 @@
 reg_t kNewWindow(EngineState *s, int argc, reg_t *argv) {
 	Common::Rect rect1 (argv[1].toSint16(), argv[0].toSint16(), argv[3].toSint16(), argv[2].toSint16());
 	Common::Rect rect2;
-	int argextra = argc == 13 ? 4 : 0; // Triggers in PQ3 and SCI1.1 games
+	int argextra = argc >= 13 ? 4 : 0; // Triggers in PQ3 and SCI1.1 games, argc 13 for DOS argc 15 for mac
 	int	style = argv[5 + argextra].toSint16();
 	int	priority = (argc > 6 + argextra) ? argv[6 + argextra].toSint16() : -1;
 	int colorPen = (argc > 7 + argextra) ? argv[7 + argextra].toSint16() : 0;
 	int colorBack = (argc > 8 + argextra) ? argv[8 + argextra].toSint16() : 255;
 
 	//	const char *title = argv[4 + argextra].segment ? kernel_dereference_char_pointer(s, argv[4 + argextra], 0) : NULL;
-	if (argc==13) {
+	if (argc>=13) {
 		rect2 = Common::Rect (argv[5].toSint16(), argv[4].toSint16(), argv[7].toSint16(), argv[6].toSint16());
 	}
 


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