[Scummvm-cvs-logs] SF.net SVN: scummvm:[53078] scummvm/branches/branch-1-2-0/engines/sci/ engine/kmisc.cpp

wjpalenstijn at users.sourceforge.net wjpalenstijn at users.sourceforge.net
Fri Oct 8 20:35:44 CEST 2010


Revision: 53078
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53078&view=rev
Author:   wjpalenstijn
Date:     2010-10-08 18:35:43 +0000 (Fri, 08 Oct 2010)

Log Message:
-----------
SCI: Backport r53077: Support kGetTime modes 2 and 3 in SCI 0_LATE

This fixes bug #3083879 in Iceman.

Modified Paths:
--------------
    scummvm/branches/branch-1-2-0/engines/sci/engine/kmisc.cpp

Modified: scummvm/branches/branch-1-2-0/engines/sci/engine/kmisc.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/engines/sci/engine/kmisc.cpp	2010-10-08 18:33:54 UTC (rev 53077)
+++ scummvm/branches/branch-1-2-0/engines/sci/engine/kmisc.cpp	2010-10-08 18:35:43 UTC (rev 53078)
@@ -188,7 +188,9 @@
 
 	int mode = (argc > 0) ? argv[0].toUint16() : 0;
 
-	if (getSciVersion() <= SCI_VERSION_0_LATE && mode > 1)
+	// Modes 2 and 3 are supported since 0.629.
+	// This condition doesn't check that exactly, but close enough.
+	if (getSciVersion() == SCI_VERSION_0_EARLY && mode > 1)
 		error("kGetTime called in SCI0 with mode %d (expected 0 or 1)", mode);
 
 	switch (mode) {


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