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

[Kirben at users.sourceforge.net]

Revision: 38646
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38646&view=rev
Author:   Kirben
Date:     2009-02-20 23:26:30 +0000 (Fri, 20 Feb 2009)

Log Message:
-----------
Switch errors back to warnings, to fix SCI 1.1 regressions.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/ksound.cpp
    scummvm/trunk/engines/sci/scicore/decompress1.cpp
    scummvm/trunk/engines/sci/scicore/script.cpp

Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp	2009-02-20 23:24:46 UTC (rev 38645)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp	2009-02-20 23:26:30 UTC (rev 38646)
@@ -938,7 +938,7 @@
 
 		case SI_ABSOLUTE_CUE:
 			signal = cue;
-			error("[CUE] "PREG" Absolute Cue: %d\n",
+			warning("[CUE] "PREG" Absolute Cue: %d",
 			        PRINT_REG(obj), signal);
 
 			PUT_SEL32V(obj, signal, signal);

Modified: scummvm/trunk/engines/sci/scicore/decompress1.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/decompress1.cpp	2009-02-20 23:24:46 UTC (rev 38645)
+++ scummvm/trunk/engines/sci/scicore/decompress1.cpp	2009-02-20 23:26:30 UTC (rev 38646)
@@ -151,7 +151,7 @@
 	CALLC(length_param = getbits(reader, 8));
 
 	if (mode == DCL_ASCII_MODE) {
-		error("DCL-INFLATE: Warning: Decompressing ASCII mode (untested)\n");
+		warning("DCL-INFLATE: Warning: Decompressing ASCII mode (untested)");
 		/*		DEBUG_DCL_INFLATE = 1; */
 	} else if (mode) {
 		error("DCL-INFLATE: Error: Encountered mode %02x, expected 00 or 01\n", mode);

Modified: scummvm/trunk/engines/sci/scicore/script.cpp
===================================================================
--- scummvm/trunk/engines/sci/scicore/script.cpp	2009-02-20 23:24:46 UTC (rev 38645)
+++ scummvm/trunk/engines/sci/scicore/script.cpp	2009-02-20 23:26:30 UTC (rev 38646)
@@ -96,6 +96,7 @@
 	case SCI_VERSION_01_VGA_ODD:
 	case SCI_VERSION_1_EARLY:
 	case SCI_VERSION_1_LATE:
+	case SCI_VERSION_1_1:
 		formats[op_lofsa][0] = Script_Offset;
 		formats[op_lofss][0] = Script_Offset;
 		break;


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