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

[lordhoto at users.sourceforge.net]

Revision: 41038
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41038&view=rev
Author:   lordhoto
Date:     2009-05-30 17:30:54 +0000 (Sat, 30 May 2009)

Log Message:
-----------
- Fix various debugC calls (parameters passed were not correct)
- Fix unused variable warning in scriptdebug.cpp

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/engine/kmovement.cpp
    scummvm/trunk/engines/sci/engine/ksound.cpp
    scummvm/trunk/engines/sci/engine/scriptdebug.cpp

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-05-30 17:06:30 UTC (rev 41037)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-05-30 17:30:54 UTC (rev 41038)
@@ -1635,7 +1635,7 @@
 		int entry_size = GET_SEL32V(obj, x);
 		int i;
 
-		debugC(2, kDebugLevelGraphics, "drawing list control %04x to %d,%d, diff %d\n", obj, x, y, SCI_MAX_SAVENAME_LENGTH);
+		debugC(2, kDebugLevelGraphics, "drawing list control %04x:%04x to %d,%d, diff %d\n", PRINT_REG(obj), x, y, SCI_MAX_SAVENAME_LENGTH);
 		cursor = GET_SEL32V(obj, cursor) - text_pos.offset;
 
 		entries_nr = 0;
@@ -2166,7 +2166,7 @@
 	GfxDynView *view = (GfxDynView *) list->_contents;
 	while (view) {
 
-		debugC(2, kDebugLevelGraphics, "  dv[%04x:%04x]: signal %04x\n", make_reg(view->_ID, view->_subID), view->signal);
+		debugC(2, kDebugLevelGraphics, "  dv[%04x:%04x]: signal %04x\n", PRINT_REG(make_reg(view->_ID, view->_subID)), view->signal);
 
 		// step 1 of subalgorithm
 		if (view->signal & _K_VIEW_SIG_FLAG_NO_UPDATE) {
@@ -3008,7 +3008,7 @@
 		_k_prepare_view_list(s, templist, _K_MAKE_VIEW_LIST_CALC_PRIORITY);
 
 		if (s->pic_not_valid) {
-			debugC(2, kDebugLevelGraphics, "PicNotValid=%d -> Subalgorithm:\n");
+			debugC(2, kDebugLevelGraphics, "PicNotValid=%d -> Subalgorithm:\n", s->pic_not_valid);
 			_k_redraw_view_list(s, templist);
 		}
 
@@ -3299,7 +3299,7 @@
 		s->r_acc = graph_save_box(s, save_area);
 		text_handle->_serial++; // This is evil!
 
-		debugC(2, kDebugLevelGraphics, "Saving (%d, %d) size (%d, %d) as %04x:%04x\n", save_area.x, save_area.y, save_area.width, save_area.height, s->r_acc);
+		debugC(2, kDebugLevelGraphics, "Saving (%d, %d) size (%d, %d) as %04x:%04x\n", save_area.x, save_area.y, save_area.width, save_area.height, PRINT_REG(s->r_acc));
 	}
 
 	debugC(2, kDebugLevelGraphics, "Display: Commiting text '%s'\n", text);

Modified: scummvm/trunk/engines/sci/engine/kmovement.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kmovement.cpp	2009-05-30 17:06:30 UTC (rev 41037)
+++ scummvm/trunk/engines/sci/engine/kmovement.cpp	2009-05-30 17:30:54 UTC (rev 41038)
@@ -620,7 +620,7 @@
 	destx = GET_SEL32V(mover, x);
 	desty = GET_SEL32V(mover, y);
 
-	debugC(2, kDebugLevelBresen, "Doing avoider %04x (dest=%d,%d)\n", avoider, destx, desty);
+	debugC(2, kDebugLevelBresen, "Doing avoider %04x:%04x (dest=%d,%d)\n", PRINT_REG(avoider), destx, desty);
 
 	if (invoke_selector(INV_SEL(mover, doit, 1) , 0)) {
 		error("Mover %04x:%04x of avoider %04x:%04x doesn't have a doit() funcselector\n", PRINT_REG(mover), PRINT_REG(avoider));

Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp	2009-05-30 17:06:30 UTC (rev 41037)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp	2009-05-30 17:30:54 UTC (rev 41038)
@@ -540,7 +540,7 @@
 		s->_sound.sfx_song_set_loops(handle, looping);
 		s->_sound.sfx_song_renice(handle, pri);
 
-		debugC(2, kDebugLevelSound, "[sound01-update-handle] -- CUE %04x:%04x");
+		debugC(2, kDebugLevelSound, "[sound01-update-handle] -- CUE %04x:%04x", PRINT_REG(obj));
 
 		PUT_SEL32V(obj, signal, signal);
 		PUT_SEL32V(obj, min, min);

Modified: scummvm/trunk/engines/sci/engine/scriptdebug.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/scriptdebug.cpp	2009-05-30 17:06:30 UTC (rev 41037)
+++ scummvm/trunk/engines/sci/engine/scriptdebug.cpp	2009-05-30 17:30:54 UTC (rev 41038)
@@ -380,7 +380,7 @@
 			break;
 
 		case KSIG_LIST: {
-			List *l = lookup_list(s, reg);
+			//List *l = lookup_list(s, reg);
 
 			sciprintf("list\n");
 


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