aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/game.cpp
diff options
context:
space:
mode:
authorWillem Jan Palenstijn2009-02-21 14:11:41 +0000
committerWillem Jan Palenstijn2009-02-21 14:11:41 +0000
commit34f90ac043230f049c58aaaf843ac347e0fc5c21 (patch)
tree36bc91c0e2ff560438f1c8e2f3e7565f82883e79 /engines/sci/engine/game.cpp
parent7ce7993c30225f3c28ce2a8d68935ef03a6e7175 (diff)
downloadscummvm-rg350-34f90ac043230f049c58aaaf843ac347e0fc5c21.tar.gz
scummvm-rg350-34f90ac043230f049c58aaaf843ac347e0fc5c21.tar.bz2
scummvm-rg350-34f90ac043230f049c58aaaf843ac347e0fc5c21.zip
revert large parts of r38621. error() is for fatal errors and does not return. warning() is not for debugging status messages.
svn-id: r38696
Diffstat (limited to 'engines/sci/engine/game.cpp')
-rw-r--r--engines/sci/engine/game.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index e4c5d969e4..5c6678fc59 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -55,7 +55,7 @@ static int _init_vocabulary(EngineState *s) { // initialize vocabulary and relat
s->opcodes = vocabulary_get_opcodes(s->resmgr);
if (!(s->selector_names = vocabulary_get_snames(s->resmgr, NULL, s->version))) {
- sciprintf("_init_vocabulary(): Could not retrieve selector names (vocab.997)");
+ sciprintf("_init_vocabulary(): Could not retrieve selector names (vocab.997)!\n");
return 1;
}
@@ -152,7 +152,7 @@ int _reset_graphics_input(EngineState *s) {
_sci1_alloc_system_colors(s);
scir_unlock_resource(s->resmgr, resource, sci_palette, 999);
} else {
- sciprintf("Couldn't find the default palette");
+ sciprintf("Couldn't find the default palette!\n");
}
}
}
@@ -330,7 +330,7 @@ int create_class_table_sci11(EngineState *s) {
classnr = getUInt16((byte*)seeker_ptr + 10);
if (classnr >= s->classtable_size) {
if (classnr >= SCRIPT_MAX_CLASSTABLE_SIZE) {
- error("Invalid class number 0x%x in script.%d(0x%x), offset %04x",
+ fprintf(stderr, "Invalid class number 0x%x in script.%d(0x%x), offset %04x\n",
classnr, scriptnr, scriptnr, seeker_offset);
return 1;
}
@@ -404,7 +404,7 @@ static int create_class_table_sci0(EngineState *s) {
if (classnr >= s->classtable_size) {
if (classnr >= SCRIPT_MAX_CLASSTABLE_SIZE) {
- error("Invalid class number 0x%x in script.%d(0x%x), offset %04x",
+ fprintf(stderr, "Invalid class number 0x%x in script.%d(0x%x), offset %04x\n",
classnr, scriptnr, scriptnr, seeker);
return 1;
}