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

[thebluegr at users.sourceforge.net]

Revision: 44855
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44855&view=rev
Author:   thebluegr
Date:     2009-10-09 23:15:54 +0000 (Fri, 09 Oct 2009)

Log Message:
-----------
Removed the wrong code for kGetTime case 1 in some SCI0 games - that case has always remained the same in all SCI versions. Added a warning in case we got some other case than 0 or 1 in SCI0 games

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

Modified: scummvm/trunk/engines/sci/engine/kmisc.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmisc.cpp	2009-10-09 23:09:28 UTC (rev 44854)
+++ scummvm/trunk/engines/sci/engine/kmisc.cpp	2009-10-09 23:15:54 UTC (rev 44855)
@@ -120,14 +120,11 @@
 	g_system->getTimeAndDate(loc_time);
 	elapsedTime = g_system->getMillis() - s->game_start_time;
 
-	if ((s->_flags & GF_SCI0_OLDGETTIME) && argc) { // Use old semantics
-		retval = (loc_time.tm_hour % 12) * 3600 + loc_time.tm_min * 60 + loc_time.tm_sec;
-		debugC(2, kDebugLevelTime, "GetTime(timeofday) returns %d", retval);
-		return make_reg(0, retval);
-	}
-
 	int mode = (argc > 0) ? argv[0].toUint16() : 0;
 
+	if (getSciVersion() <= SCI_VERSION_0_LATE && mode > 1)
+		warning("kGetTime called in SCI0 with mode %d (expected 0 or 1)", mode);
+
 	switch (mode) {
 	case K_NEW_GETTIME_TICKS :
 		retval = elapsedTime * 60 / 1000;


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