diff options
| author | Travis Howell | 2009-02-20 23:26:30 +0000 |
|---|---|---|
| committer | Travis Howell | 2009-02-20 23:26:30 +0000 |
| commit | f6b4c2544bb6ae8c682bed79fc6806aa90013192 (patch) | |
| tree | 94810d8094df30492e765fc8268c552c7329794c | |
| parent | c729101d5bc41586d7f8ac63feea56e9d4ee59e9 (diff) | |
| download | scummvm-rg350-f6b4c2544bb6ae8c682bed79fc6806aa90013192.tar.gz scummvm-rg350-f6b4c2544bb6ae8c682bed79fc6806aa90013192.tar.bz2 scummvm-rg350-f6b4c2544bb6ae8c682bed79fc6806aa90013192.zip | |
Switch errors back to warnings, to fix SCI 1.1 regressions.
svn-id: r38646
| -rw-r--r-- | engines/sci/engine/ksound.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/scicore/decompress1.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/scicore/script.cpp | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp index 21b476c5c1..2a02461fa3 100644 --- a/engines/sci/engine/ksound.cpp +++ b/engines/sci/engine/ksound.cpp @@ -938,7 +938,7 @@ kDoSound_SCI1(state_t *s, int funct_nr, int argc, reg_t *argv) { 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); diff --git a/engines/sci/scicore/decompress1.cpp b/engines/sci/scicore/decompress1.cpp index 250aa9bb83..4a62eb940d 100644 --- a/engines/sci/scicore/decompress1.cpp +++ b/engines/sci/scicore/decompress1.cpp @@ -151,7 +151,7 @@ decrypt4_hdyn(byte *dest, int length, struct bit_read_struct *reader) { 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); diff --git a/engines/sci/scicore/script.cpp b/engines/sci/scicore/script.cpp index ebdfea695c..09fec62a89 100644 --- a/engines/sci/scicore/script.cpp +++ b/engines/sci/scicore/script.cpp @@ -96,6 +96,7 @@ void script_adjust_opcode_formats(int res_version) { 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; |