Remove excess \n.

svn-id: r38695

10 files changed, 55 insertions, 54 deletions

diff --git a/engines/sci/engine/game.cpp b/engines/sci/engine/game.cpp
index 5d72527dbb..e4c5d969e4 100644
--- a/engines/sci/engine/game.cpp
+++ b/engines/sci/engine/game.cpp
@@ -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\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 @@ 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\n",
+							error("Invalid class number 0x%x in script.%d(0x%x), offset %04x",
 							        classnr, scriptnr, scriptnr, seeker);
 							return 1;
 						}
diff --git a/engines/sci/engine/kernel.cpp b/engines/sci/engine/kernel.cpp
index 4faf506efe..49d612e998 100644
--- a/engines/sci/engine/kernel.cpp
+++ b/engines/sci/engine/kernel.cpp
@@ -356,7 +356,7 @@ static const char *argtype_description[] = { "Undetermined (WTF?)", "List", "Nod
 
 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 @@ byte *kmem(EngineState *s, reg_t handle) {
 	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 k_Unknown(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 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 @@ reg_t kGetTime(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 		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 @@ reg_t kGetTime(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 			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 @@ reg_t kMemory(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	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;
diff --git a/engines/sci/engine/kfile.cpp b/engines/sci/engine/kfile.cpp
index e4f8e326b8..c30a91d719 100644
--- a/engines/sci/engine/kfile.cpp
+++ b/engines/sci/engine/kfile.cpp
@@ -380,7 +380,7 @@ reg_t kDeviceInfo_Win32(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	}
 	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 @@ reg_t kDeviceInfo_Unix(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	}
 	break;
 	default: {
-		error("Unknown DeviceInfo() sub-command: %d\n", mode);
+		error("Unknown DeviceInfo() sub-command: %d", mode);
 	}
 	}
 
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index 100f63cfb4..205204b0ba 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -234,7 +234,7 @@ void graph_restore_box(EngineState *s, reg_t handle) {
 		} 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 @@ void _k_dirloop(reg_t obj, word angle, EngineState *s, int funct_nr, int argc, r
 	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 @@ reg_t kCelHigh(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	}
 
 	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 @@ reg_t kCelWide(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	}
 
 	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 @@ reg_t kNumLoops(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	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 @@ reg_t kNumCels(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	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 @@ reg_t kDrawPic(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	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 @@ static void _k_view_list_do_postdraw(EngineState *s, gfxw_list_t *list) {
 				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 @@ int _k_view_list_dispose_loop(EngineState *s, list_t *list, gfxw_dyn_view_t *wid
 				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 @@ static void _k_make_view_list(EngineState *s, gfxw_list_t **widget_list, list_t
 	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 @@ static void _k_prepare_view_list(EngineState *s, gfxw_list_t *list, int options)
 		// 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 @@ reg_t kAddToPic(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 		                                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 @@ reg_t kSetPort(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 		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 @@ reg_t kSetPort(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 		break;
 	}
 	default :
-		error("SetPort was called with %d parameters\n", argc);
+		error("SetPort was called with %d parameters", argc);
 		break;
 	}
 
@@ -2388,13 +2389,13 @@ reg_t kDrawCel(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 
 /*
 	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 @@ reg_t kDisposeWindow(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	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;
 	}
 
diff --git a/engines/sci/engine/klists.cpp b/engines/sci/engine/klists.cpp
index e7194010fc..6cbcb84d60 100644
--- a/engines/sci/engine/klists.cpp
+++ b/engines/sci/engine/klists.cpp
@@ -256,7 +256,7 @@ inline void _k_add_to_front(EngineState *s, reg_t listbase, reg_t nodebase) {
 	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 @@ inline void _k_add_to_end(EngineState *s, reg_t listbase, reg_t nodebase) {
 	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));
 
diff --git a/engines/sci/engine/kmovement.cpp b/engines/sci/engine/kmovement.cpp
index 7f212cabe2..df3acd6f47 100644
--- a/engines/sci/engine/kmovement.cpp
+++ b/engines/sci/engine/kmovement.cpp
@@ -435,7 +435,7 @@ reg_t kDoAvoider(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 
 	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 @@ reg_t kDoAvoider(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 
 			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 @@ reg_t kDoAvoider(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 		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 {
diff --git a/engines/sci/engine/kscripts.cpp b/engines/sci/engine/kscripts.cpp
index 2f2b914370..45cd9cd5e3 100644
--- a/engines/sci/engine/kscripts.cpp
+++ b/engines/sci/engine/kscripts.cpp
@@ -71,7 +71,7 @@ int invoke_selector(EngineState *s, reg_t object, int selector_id, int noinvalid
 	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 @@ reg_t kDisposeClone(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	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 @@ reg_t kScriptID(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 	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;
 	}
 
diff --git a/engines/sci/engine/ksound.cpp b/engines/sci/engine/ksound.cpp
index f6d40bd706..ccdcb5c836 100644
--- a/engines/sci/engine/ksound.cpp
+++ b/engines/sci/engine/ksound.cpp
@@ -947,7 +947,7 @@ kDoSound_SCI1(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 			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);
diff --git a/engines/sci/engine/kstring.cpp b/engines/sci/engine/kstring.cpp
index 1a547cd162..69bad01175 100644
--- a/engines/sci/engine/kstring.cpp
+++ b/engines/sci/engine/kstring.cpp
@@ -33,7 +33,7 @@ namespace Sci {
 
 #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 @@ char *kernel_lookup_text(EngineState *s, reg_t address, int index) {
 		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 @@ reg_t kGetFarText(EngineState *s, int funct_nr, int argc, reg_t *argv) {
 
 
 	if (!textres) {
-		error("text.%d does not exist\n", UKPV(0));
+		error("text.%d does not exist", UKPV(0));
 		return NULL_REG;
 	}
 
diff --git a/engines/sci/engine/seg_manager.cpp b/engines/sci/engine/seg_manager.cpp
index c2fd99c514..8ef87cacda 100644
--- a/engines/sci/engine/seg_manager.cpp
+++ b/engines/sci/engine/seg_manager.cpp
@@ -1484,10 +1484,10 @@ static void list_all_outgoing_references_script(seg_interface_t *self, EngineSta
 			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 @@ static void list_all_outgoing_references_clones(seg_interface_t *self, EngineSta
 	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 seg_interface_t seg_interface_locals = {
 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 @@ static void list_all_outgoing_references_list(seg_interface_t *self, EngineState
 	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 @@ static void list_all_outgoing_references_nodes(seg_interface_t *self, EngineStat
 	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;
 	}