[Scummvm-cvs-logs] SF.net SVN: scummvm:[38695] scummvm/trunk/engines/sci/engine
Kirben at users.sourceforge.net
Kirben at users.sourceforge.net
Sat Feb 21 14:19:44 CET 2009
Revision: 38695
http://scummvm.svn.sourceforge.net/scummvm/?rev=38695&view=rev
Author: Kirben
Date: 2009-02-21 13:19:44 +0000 (Sat, 21 Feb 2009)
Log Message:
-----------
Remove excess \n.
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/game.cpp
scummvm/trunk/engines/sci/engine/kernel.cpp
scummvm/trunk/engines/sci/engine/kfile.cpp
scummvm/trunk/engines/sci/engine/kgraphics.cpp
scummvm/trunk/engines/sci/engine/klists.cpp
scummvm/trunk/engines/sci/engine/kmovement.cpp
scummvm/trunk/engines/sci/engine/kscripts.cpp
scummvm/trunk/engines/sci/engine/ksound.cpp
scummvm/trunk/engines/sci/engine/kstring.cpp
scummvm/trunk/engines/sci/engine/seg_manager.cpp
Modified: scummvm/trunk/engines/sci/engine/game.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/game.cpp 2009-02-21 12:58:09 UTC (rev 38694)
+++ scummvm/trunk/engines/sci/engine/game.cpp 2009-02-21 13:19:44 UTC (rev 38695)
@@ -330,7 +330,7 @@
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\n",
+ error("Invalid class number 0x%x in script.%d(0x%x), offset %04x",
classnr, scriptnr, scriptnr, seeker_offset);
return 1;
}
@@ -404,7 +404,7 @@
if (classnr >= s->classtable_size) {
if (classnr >= SCRIPT_MAX_CLASSTABLE_SIZE) {
- error("Invalid class number 0x%x in script.%d(0x%x), offset %04x\n",
+ error("Invalid class number 0x%x in script.%d(0x%x), offset %04x",
classnr, scriptnr, scriptnr, seeker);
return 1;
}
Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp 2009-02-21 12:58:09 UTC (rev 38694)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp 2009-02-21 13:19:44 UTC (rev 38695)
@@ -356,7 +356,7 @@
int kernel_oops(EngineState *s, const char *file, int line, const char *reason) {
sciprintf("Kernel Oops in file %s, line %d: %s\n", file, line, reason);
- error("Kernel Oops in file %s, line %d: %s\n", file, line, reason);
+ error("Kernel Oops in file %s, line %d: %s", file, line, reason);
script_debug_flag = script_error_flag = 1;
return 0;
}
@@ -389,7 +389,7 @@
hunk_table_t *ht = &(mobj->data.hunks);
if (!mobj || !ENTRY_IS_VALID(ht, handle.offset)) {
- error("Error: kmem() with invalid handle\n");
+ error("Error: kmem() with invalid handle");
return NULL;
}
@@ -477,7 +477,7 @@
reg_t kFlushResources(EngineState *s, int funct_nr, int argc, reg_t *argv) {
run_gc(s);
// FIXME: remove the Sci:: bit once this belongs to the Sci namespace
- debugC(2, Sci::kDebugLevelRoom, "Entering room number %d\n", UKPV(0));
+ debugC(2, Sci::kDebugLevelRoom, "Entering room number %d", UKPV(0));
return s->r_acc;
}
@@ -525,13 +525,13 @@
if (argc) { // Get seconds since last am/pm switch
retval = loc_time->tm_sec + loc_time->tm_min * 60 + (loc_time->tm_hour % 12) * 3600;
// FIXME: remove the Sci:: bit once this belongs to the Sci namespace
- debugC(2, Sci::kDebugLevelTime, "GetTime(timeofday) returns %d\n", retval);
+ debugC(2, Sci::kDebugLevelTime, "GetTime(timeofday) returns %d", retval);
} else { // Get time since game started
sci_get_current_time(&time_prec);
retval = ((time_prec.tv_usec - s->game_start_time.tv_usec) * 60 / 1000000) +
(time_prec.tv_sec - s->game_start_time.tv_sec) * 60;
// FIXME: remove the Sci:: bit once this belongs to the Sci namespace
- debugC(2, Sci::kDebugLevelTime, "GetTime(elapsed) returns %d\n", retval);
+ debugC(2, Sci::kDebugLevelTime, "GetTime(elapsed) returns %d", retval);
}
} else {
int mode = UKPV_OR_ALT(0, 0);
@@ -544,26 +544,26 @@
retval = ((time_prec.tv_usec - s->game_start_time.tv_usec) * 60 / 1000000) +
(time_prec.tv_sec - s->game_start_time.tv_sec) * 60;
// FIXME: remove the Sci:: bit once this belongs to the Sci namespace
- debugC(2, Sci::kDebugLevelTime, "GetTime(elapsed) returns %d\n", retval);
+ debugC(2, Sci::kDebugLevelTime, "GetTime(elapsed) returns %d", retval);
break;
}
case _K_NEW_GETTIME_TIME_12HOUR : {
loc_time->tm_hour %= 12;
retval = (loc_time->tm_min << 6) | (loc_time->tm_hour << 12) | (loc_time->tm_sec);
// FIXME: remove the Sci:: bit once this belongs to the Sci namespace
- debugC(2, Sci::kDebugLevelTime, "GetTime(12h) returns %d\n", retval);
+ debugC(2, Sci::kDebugLevelTime, "GetTime(12h) returns %d", retval);
break;
}
case _K_NEW_GETTIME_TIME_24HOUR : {
retval = (loc_time->tm_min << 5) | (loc_time->tm_sec >> 1) | (loc_time->tm_hour << 11);
// FIXME: remove the Sci:: bit once this belongs to the Sci namespace
- debugC(2, Sci::kDebugLevelTime, "GetTime(24h) returns %d\n", retval);
+ debugC(2, Sci::kDebugLevelTime, "GetTime(24h) returns %d", retval);
break;
}
case _K_NEW_GETTIME_DATE : {
retval = (loc_time->tm_mon << 5) | loc_time->tm_mday | (loc_time->tm_year << 9);
// FIXME: remove the Sci:: bit once this belongs to the Sci namespace
- debugC(2, Sci::kDebugLevelTime, "GetTime(date) returns %d\n", retval);
+ debugC(2, Sci::kDebugLevelTime, "GetTime(date) returns %d", retval);
break;
}
default: {
@@ -587,7 +587,7 @@
switch (UKPV(0)) {
case K_MEMORY_ALLOCATE_CRITICAL :
if (!sm_alloc_dynmem(&s->seg_manager, UKPV(1), "kMemory() critical", &s->r_acc)) {
- error("Critical heap allocation failed\n");
+ error("Critical heap allocation failed");
script_error_flag = script_debug_flag = 1;
}
return s->r_acc;
Modified: scummvm/trunk/engines/sci/engine/kfile.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kfile.cpp 2009-02-21 12:58:09 UTC (rev 38694)
+++ scummvm/trunk/engines/sci/engine/kfile.cpp 2009-02-21 13:19:44 UTC (rev 38695)
@@ -380,7 +380,7 @@
}
break;
default: {
- error("Unknown DeviceInfo() sub-command: %d\n", mode);
+ error("Unknown DeviceInfo() sub-command: %d", mode);
}
}
return s->r_acc;
@@ -442,7 +442,7 @@
}
break;
default: {
- error("Unknown DeviceInfo() sub-command: %d\n", mode);
+ error("Unknown DeviceInfo() sub-command: %d", mode);
}
}
Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp 2009-02-21 12:58:09 UTC (rev 38694)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp 2009-02-21 13:19:44 UTC (rev 38695)
@@ -234,7 +234,7 @@
} while (parent && (gfxw_widget_matches_snapshot(*ptr, GFXW(parent))));
if (!parent) {
- error("Attempted widget mass destruction by a snapshot\n");
+ error("Attempted widget mass destruction by a snapshot");
BREAKPOINT();
}
@@ -712,7 +712,7 @@
maxloops = gfxop_lookup_view_get_loops(s->gfx_state, view);
if (maxloops == GFX_ERROR) {
- error("Invalid view.%03d\n", view);
+ error("Invalid view.%03d", view);
return;
} else if ((loop > 1) && (maxloops < 4))
return;
@@ -903,7 +903,7 @@
}
if (gfxop_get_cel_parameters(s->gfx_state, view, loop, cel, &width, &height, &offset)) {
- error("Invalid loop (%d) or cel (%d) in view.%d (0x%x), or view invalid\n", loop, cel, view, view);
+ error("Invalid loop (%d) or cel (%d) in view.%d (0x%x), or view invalid", loop, cel, view, view);
return NULL_REG;
} else
return make_reg(0, height);
@@ -921,7 +921,7 @@
}
if (gfxop_get_cel_parameters(s->gfx_state, view, loop, cel, &width, &height, &offset)) {
- error("Invalid loop (%d) or cel (%d) in view.%d (0x%x), or view invalid\n", loop, cel, view, view);
+ error("Invalid loop (%d) or cel (%d) in view.%d (0x%x), or view invalid", loop, cel, view, view);
return NULL_REG;
} else
return make_reg(0, width);
@@ -933,7 +933,7 @@
int loops_nr = gfxop_lookup_view_get_loops(s->gfx_state, view);
if (loops_nr < 0) {
- error("view.%d (0x%x) not found\n", view, view);
+ error("view.%d (0x%x) not found", view, view);
return NULL_REG;
}
@@ -952,7 +952,7 @@
if (gfxop_check_cel(s->gfx_state, view, &loop, &cel)) {
// OK, this is a hack and there's a
// real function to calculate cel numbers...
- error("view.%d (0x%x) not found\n", view, view);
+ error("view.%d (0x%x) not found", view, view);
return NULL_REG;
}
@@ -1056,10 +1056,11 @@
if (sci01_priority_table_flags & 0x2) {
if (s->pic_priority_table) {
int i;
- error("---------------------------\nPriority table:\n");
+ printf("---------------------------\nPriority table:\n");
for (i = 0; i < 16; i++)
- error("\t%d:\t%d\n", i, s->pic_priority_table[i]);
- error("---------------------------\n");
+ printf("\t%d:\t%d\n", i, s->pic_priority_table[i]);
+ printf("---------------------------\n");
+ error("Error");
}
}
if (sci01_priority_table_flags & 0x1)
@@ -1721,19 +1722,19 @@
temp = GET_SEL32V(obj, nsBottom);
PUT_SEL32V(obj, lsBottom, temp);
#ifdef DEBUG_LSRECT
- error("lsRected "PREG"\n", PRINT_REG(obj));
+ error("lsRected "PREG"", PRINT_REG(obj));
#endif
}
#ifdef DEBUG_LSRECT
else
- error("Not lsRecting "PREG" because %d\n", PRINT_REG(obj), lookup_selector(s, obj, s->selector_map.nsBottom, NULL, NULL));
+ error("Not lsRecting "PREG" because %d", PRINT_REG(obj), lookup_selector(s, obj, s->selector_map.nsBottom, NULL, NULL));
#endif
if (widget->signal & _K_VIEW_SIG_FLAG_HIDDEN)
widget->signal |= _K_VIEW_SIG_FLAG_REMOVE;
}
#ifdef DEBUG_LSRECT
- error("obj "PREG" has pflags %x\n", PRINT_REG(obj), (widget->signal & (_K_VIEW_SIG_FLAG_REMOVE | _K_VIEW_SIG_FLAG_NO_UPDATE)));
+ error("obj "PREG" has pflags %x", PRINT_REG(obj), (widget->signal & (_K_VIEW_SIG_FLAG_REMOVE | _K_VIEW_SIG_FLAG_NO_UPDATE)));
#endif
if (widget->signalp) {
@@ -1785,7 +1786,7 @@
reg_t under_bits = NULL_REG;
if (!is_object(s, obj)) {
- error("Non-object "PREG" present in view list during delete time\n", PRINT_REG(obj));
+ error("Non-object "PREG" present in view list during delete time", PRINT_REG(obj));
obj = NULL_REG;
} else
if (widget->under_bitsp) { // Is there a bg picture left to clean?
@@ -1940,7 +1941,7 @@
gfxw_dyn_view_t *widget;
if (!*widget_list) {
- error("make_view_list with widget_list == ()\n");
+ error("make_view_list with widget_list == ()");
BREAKPOINT();
};
@@ -2068,7 +2069,7 @@
// Never happens
/* if (view->signal & 0) {
view->signal &= ~_K_VIEW_SIG_FLAG_FREESCI_STOPUPD;
- error("Unsetting magic StopUpd for view "PREG"\n", PRINT_REG(obj));
+ error("Unsetting magic StopUpd for view "PREG"", PRINT_REG(obj));
} */
view = (gfxw_dyn_view_t *) view->next;
@@ -2267,7 +2268,7 @@
priority, -1 /* No priority */ , ALIGN_CENTER, ALIGN_BOTTOM, 0));
if (!widget) {
- error("Attempt to single-add invalid picview (%d/%d/%d)\n", view, loop, cel);
+ error("Attempt to single-add invalid picview (%d/%d/%d)", view, loop, cel);
} else {
widget->ID = -1;
if (control >= 0) {
@@ -2331,7 +2332,7 @@
new_port = gfxw_find_port(s->visual, port_nr);
if (!new_port) {
- error("Invalid port %04x requested\n", port_nr);
+ error("Invalid port %04x requested", port_nr);
return NULL_REG;
}
@@ -2359,7 +2360,7 @@
break;
}
default :
- error("SetPort was called with %d parameters\n", argc);
+ error("SetPort was called with %d parameters", argc);
break;
}
@@ -2388,13 +2389,13 @@
/*
if (!view) {
- error("Attempt to draw non-existing view.%03d\n", view);
+ error("Attempt to draw non-existing view.%03d", view);
return;
}
*/
if (gfxop_check_cel(s->gfx_state, view, &loop, &cel)) {
- error("Attempt to draw non-existing view.%03d\n", view);
+ error("Attempt to draw non-existing view.%03d", view);
return s->r_acc;
}
@@ -2422,7 +2423,7 @@
gfxw_widget_kill_chrono(s->visual, goner_nr);
goner = gfxw_find_port(s->visual, goner_nr);
if ((goner_nr < 3) || (goner == NULL)) {
- error("Removal of invalid window %04x requested\n", goner_nr);
+ error("Removal of invalid window %04x requested", goner_nr);
return s->r_acc;
}
Modified: scummvm/trunk/engines/sci/engine/klists.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/klists.cpp 2009-02-21 12:58:09 UTC (rev 38694)
+++ scummvm/trunk/engines/sci/engine/klists.cpp 2009-02-21 13:19:44 UTC (rev 38695)
@@ -256,7 +256,7 @@
SCIkdebug(SCIkNODES, "Adding node "PREG" to end of list "PREG"\n", PRINT_REG(nodebase), PRINT_REG(listbase));
if (!new_n)
- error("Attempt to add non-node ("PREG") to list at "PREG"\n", PRINT_REG(nodebase), PRINT_REG(listbase));
+ error("Attempt to add non-node ("PREG") to list at "PREG"", PRINT_REG(nodebase), PRINT_REG(listbase));
if (!l || !sane_listp(s, listbase))
error("List at "PREG" is not sane anymore", PRINT_REG(listbase));
@@ -279,7 +279,7 @@
SCIkdebug(SCIkNODES, "Adding node "PREG" to end of list "PREG"\n", PRINT_REG(nodebase), PRINT_REG(listbase));
if (!new_n)
- error("Attempt to add non-node ("PREG") to list at "PREG"\n", PRINT_REG(nodebase), PRINT_REG(listbase));
+ error("Attempt to add non-node ("PREG") to list at "PREG"", PRINT_REG(nodebase), PRINT_REG(listbase));
if (!l || !sane_listp(s, listbase))
error("List at "PREG" is not sane anymore", PRINT_REG(listbase));
Modified: scummvm/trunk/engines/sci/engine/kmovement.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmovement.cpp 2009-02-21 12:58:09 UTC (rev 38694)
+++ scummvm/trunk/engines/sci/engine/kmovement.cpp 2009-02-21 13:19:44 UTC (rev 38695)
@@ -435,7 +435,7 @@
if (invoke_selector(INV_SEL(client, isBlocked, 1) , 0)) {
error("Client "PREG" of avoider "PREG" doesn't"
- " have an isBlocked() funcselector\n", PRINT_REG(client), PRINT_REG(avoider));
+ " have an isBlocked() funcselector", PRINT_REG(client), PRINT_REG(avoider));
return NULL_REG;
}
@@ -466,7 +466,7 @@
if (invoke_selector(INV_SEL(client, canBeHere, 1) , 0)) {
error("Client "PREG" of avoider "PREG" doesn't"
- " have a canBeHere() funcselector\n", PRINT_REG(client), PRINT_REG(avoider));
+ " have a canBeHere() funcselector", PRINT_REG(client), PRINT_REG(avoider));
return NULL_REG;
}
@@ -500,7 +500,7 @@
if (looper.segment) {
if (invoke_selector(INV_SEL(looper, doit, 1), 2, angle, client)) {
error("Looper "PREG" of avoider "PREG" doesn't"
- " have a doit() funcselector\n", PRINT_REG(looper), PRINT_REG(avoider));
+ " have a doit() funcselector", PRINT_REG(looper), PRINT_REG(avoider));
} else
return s->r_acc;
} else {
Modified: scummvm/trunk/engines/sci/engine/kscripts.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kscripts.cpp 2009-02-21 12:58:09 UTC (rev 38694)
+++ scummvm/trunk/engines/sci/engine/kscripts.cpp 2009-02-21 13:19:44 UTC (rev 38695)
@@ -71,7 +71,7 @@
slc_type = lookup_selector(s, object, selector_id, NULL, &address);
if (slc_type == SELECTOR_NONE) {
- error("Selector '%s' of object at "PREG" could not be invoked (%s L%d)\n",
+ error("Selector '%s' of object at "PREG" could not be invoked (%s L%d)",
s->selector_names[selector_id], PRINT_REG(object), fname, line);
if (noinvalid == 0)
KERNEL_OOPS("Not recoverable: VM was halted\n");
@@ -198,7 +198,7 @@
word underBits;
if (!victim_obj) {
- error("Attempt to dispose non-class/object at "PREG"\n",
+ error("Attempt to dispose non-class/object at "PREG"",
PRINT_REG(victim_addr));
return s->r_acc;
}
@@ -246,12 +246,12 @@
scr = &(s->seg_manager.heap[scriptid]->data.script);
if (!scr->exports_nr) {
- error("Script 0x%x does not have a dispatch table\n", script);
+ error("Script 0x%x does not have a dispatch table", script);
return NULL_REG;
}
if (index > scr->exports_nr) {
- error("Dispatch index too big: %d > %d\n", index, scr->exports_nr);
+ error("Dispatch index too big: %d > %d", index, scr->exports_nr);
return NULL_REG;
}
Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp 2009-02-21 12:58:09 UTC (rev 38694)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp 2009-02-21 13:19:44 UTC (rev 38695)
@@ -947,7 +947,7 @@
break;
case SI_RELATIVE_CUE:
- error("[CUE] "PREG" Relative Cue: %d\n",
+ error("[CUE] "PREG" Relative Cue: %d",
PRINT_REG(obj), cue);
PUT_SEL32V(obj, dataInc, cue);
Modified: scummvm/trunk/engines/sci/engine/kstring.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kstring.cpp 2009-02-21 12:58:09 UTC (rev 38694)
+++ scummvm/trunk/engines/sci/engine/kstring.cpp 2009-02-21 13:19:44 UTC (rev 38695)
@@ -33,7 +33,7 @@
#define CHECK_OVERFLOW1(pt, size, rv) \
if (((pt) - (str_base)) + (size) > maxsize) { \
- error("String expansion exceeded heap boundaries\n"); \
+ error("String expansion exceeded heap boundaries"); \
return rv;\
}
@@ -64,7 +64,7 @@
if (textlen)
return seeker;
else {
- error("Index %d out of bounds in text.%03d\n", _index, address.offset);
+ error("Index %d out of bounds in text.%03d", _index, address.offset);
return 0;
}
@@ -697,7 +697,7 @@
if (!textres) {
- error("text.%d does not exist\n", UKPV(0));
+ error("text.%d does not exist", UKPV(0));
return NULL_REG;
}
Modified: scummvm/trunk/engines/sci/engine/seg_manager.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/seg_manager.cpp 2009-02-21 12:58:09 UTC (rev 38694)
+++ scummvm/trunk/engines/sci/engine/seg_manager.cpp 2009-02-21 13:19:44 UTC (rev 38695)
@@ -1484,10 +1484,10 @@
for (i = 0; i < obj->variables_nr; i++)
(*note)(param, obj->variables[i]);
} else {
- error("Request for outgoing script-object reference at "PREG" yielded invalid index %d\n", PRINT_REG(addr), idx);
+ error("Request for outgoing script-object reference at "PREG" yielded invalid index %d", PRINT_REG(addr), idx);
}
} else {
- //error("Unexpected request for outgoing script-object references at "PREG"\n", PRINT_REG(addr));
+ //error("Unexpected request for outgoing script-object references at "PREG"", PRINT_REG(addr));
// Happens e.g. when we're looking into strings
}
}
@@ -1529,7 +1529,7 @@
assert(addr.segment == self->seg_id);
if (!(ENTRY_IS_VALID(clone_table, addr.offset))) {
- error("Unexpected request for outgoing references from clone at "PREG"\n", PRINT_REG(addr));
+ error("Unexpected request for outgoing references from clone at "PREG"", PRINT_REG(addr));
// BREAKPOINT();
return;
}
@@ -1620,7 +1620,7 @@
static void list_all_outgoing_references_stack(seg_interface_t *self, EngineState *s, reg_t addr, void *param, void (*note)(void*param, reg_t addr)) {
int i;
- error("Emitting %d stack entries\n", self->mobj->data.stack.nr);
+ printf("Emitting %d stack entries\n", self->mobj->data.stack.nr);
for (i = 0; i < self->mobj->data.stack.nr; i++)
(*note)(param, self->mobj->data.stack.entries[i]);
@@ -1665,7 +1665,7 @@
list_t *list = &(table->table[addr.offset].entry);
if (!ENTRY_IS_VALID(table, addr.offset)) {
- error("Invalid list referenced for outgoing references: "PREG"\n", PRINT_REG(addr));
+ error("Invalid list referenced for outgoing references: "PREG"", PRINT_REG(addr));
return;
}
@@ -1702,7 +1702,7 @@
node_t *node = &(table->table[addr.offset].entry);
if (!ENTRY_IS_VALID(table, addr.offset)) {
- error("Invalid node referenced for outgoing references: "PREG"\n", PRINT_REG(addr));
+ error("Invalid node referenced for outgoing references: "PREG"", PRINT_REG(addr));
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list