aboutsummaryrefslogtreecommitdiff
path: root/engines/sci
diff options
context:
space:
mode:
authorJoost Peters2009-02-21 12:58:09 +0000
committerJoost Peters2009-02-21 12:58:09 +0000
commit177c4169d1bbf838316de55e61acfb8136e9c794 (patch)
treebae0b55077435ea320303f25dcead3f5b454697d /engines/sci
parentd11948a01cc234c84f122f7c9febc69b39a00d8f (diff)
downloadscummvm-rg350-177c4169d1bbf838316de55e61acfb8136e9c794.tar.gz
scummvm-rg350-177c4169d1bbf838316de55e61acfb8136e9c794.tar.bz2
scummvm-rg350-177c4169d1bbf838316de55e61acfb8136e9c794.zip
error() calls don't need \n, as it is already appended in error() itself
svn-id: r38694
Diffstat (limited to 'engines/sci')
-rw-r--r--engines/sci/engine/kfile.cpp6
-rw-r--r--engines/sci/engine/sys_strings.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index 8f260fae65..e4f8e326b8 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -186,12 +186,12 @@ reg_t kFOpen(EngineState *s, int funct_nr, int argc, reg_t *argv) {
static FILE *getFileFromHandle(EngineState *s, int handle) {
if (handle == 0) {
- error("Attempt to use file handle 0\n");
+ error("Attempt to use file handle 0");
return 0;
}
if ((handle >= s->file_handles_nr) || (s->file_handles[handle] == NULL)) {
- error("Attempt to use invalid/unused file handle %d\n", handle);
+ error("Attempt to use invalid/unused file handle %d", handle);
return 0;
}
@@ -901,7 +901,7 @@ reg_t kFileIO(EngineState *s, int funct_nr, int argc, reg_t *argv) {
break;
}
default :
- error("Unknown FileIO() sub-command: %d\n", func_nr);
+ error("Unknown FileIO() sub-command: %d", func_nr);
}
return s->r_acc;
diff --git a/engines/sci/engine/sys_strings.cpp b/engines/sci/engine/sys_strings.cpp
index 9ffb4323cd..910a5b1a74 100644
--- a/engines/sci/engine/sys_strings.cpp
+++ b/engines/sci/engine/sys_strings.cpp
@@ -33,12 +33,12 @@ void sys_string_acquire(sys_strings_t *strings, int index, const char *name, int
sys_string_t *str = strings->strings + index;
if (index < 0 || index >= SYS_STRINGS_MAX) {
- error("[SYSSTR] Error: Attempt to acquire string #%d\n", index);
+ error("[SYSSTR] Error: Attempt to acquire string #%d", index);
BREAKPOINT();
}
if (str->name && (strcmp(name, str->name) || (str->max_size != max_len))) {
- error("[SYSSTR] Error: Attempt to re-acquire existing string #%d; was '%s', tried to claim as '%s'\n", index, str->name, name);
+ error("[SYSSTR] Error: Attempt to re-acquire existing string #%d; was '%s', tried to claim as '%s'", index, str->name, name);
BREAKPOINT();
}
@@ -52,7 +52,7 @@ int sys_string_set(sys_strings_t *strings, int index, const char *value) {
sys_string_t *str = strings->strings + index;
if (index < 0 || index >= SYS_STRINGS_MAX || !str->name) {
- error("[SYSSTR] Error: Attempt to write to invalid/unused string #%d\n", index);
+ error("[SYSSTR] Error: Attempt to write to invalid/unused string #%d", index);
BREAKPOINT();
return 1;
}