[Scummvm-cvs-logs] SF.net SVN: scummvm:[40681] scummvm/trunk/engines/sci/engine/klists.cpp

[lordhoto at users.sourceforge.net]

Revision: 40681
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40681&view=rev
Author:   lordhoto
Date:     2009-05-18 11:56:00 +0000 (Mon, 18 May 2009)

Log Message:
-----------
Don't print __FILE__,__LINE__ in *_list related debug output, it would only print klists.cpp and the according line anyway.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/klists.cpp

Modified: scummvm/trunk/engines/sci/engine/klists.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/klists.cpp	2009-05-18 11:53:04 UTC (rev 40680)
+++ scummvm/trunk/engines/sci/engine/klists.cpp	2009-05-18 11:56:00 UTC (rev 40681)
@@ -38,14 +38,14 @@
 		// seem to have any apparent ill-effects, though, so it's been changed to non-fatal, for now
 		//sciprintf("%s, L%d: Attempt to use non-node "PREG" as list node\n", __FILE__, __LINE__, PRINT_REG(addr));
 		//script_debug_flag = script_error_flag = 1;
-		warning("%s, L%d: Attempt to use non-node "PREG" as list node", __FILE__, __LINE__, PRINT_REG(addr));
+		warning("Attempt to use non-node "PREG" as list node", PRINT_REG(addr));
 		return NULL;
 	}
 
 	NodeTable *nt = (NodeTable *)mobj;
 
 	if (!ENTRY_IS_VALID(nt, addr.offset)) {
-		sciprintf("%s, L%d: Attempt to use non-node "PREG" as list node", __FILE__, __LINE__, PRINT_REG(addr));
+		sciprintf("Attempt to use non-node "PREG" as list node\n", PRINT_REG(addr));
 		script_debug_flag = script_error_flag = 1;
 		return NULL;
 	}
@@ -57,7 +57,7 @@
 	MemObject *mobj = GET_SEGMENT(*s->seg_manager, addr.segment, MEM_OBJ_LISTS);
 
 	if (!mobj) {
-		sciprintf("%s, L%d: Attempt to use non-list "PREG" as list", __FILE__, __LINE__, PRINT_REG(addr));
+		sciprintf("Attempt to use non-list "PREG" as list\n", PRINT_REG(addr));
 		script_debug_flag = script_error_flag = 1;
 		return NULL;
 	}
@@ -65,7 +65,7 @@
 	ListTable *lt = (ListTable *)mobj;
 
 	if (!ENTRY_IS_VALID(lt, addr.offset)) {
-		sciprintf("%s, L%d: Attempt to use non-list "PREG" as list\n", __FILE__, __LINE__, PRINT_REG(addr));
+		sciprintf("Attempt to use non-list "PREG" as list\n", PRINT_REG(addr));
 		script_debug_flag = script_error_flag = 1;
 		return NULL;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.