[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.252,1.253 simon.h,1.79,1.80 vga.cpp,1.68,1.69

[Travis Howell]

Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv24970/simon

Modified Files:
	simon.cpp simon.h vga.cpp 
Log Message:

Use debug output instead of warnings for simon
Fix debug output in sky


Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.252
retrieving revision 1.253
diff -u -d -r1.252 -r1.253
--- simon.cpp	14 Jul 2003 10:02:37 -0000	1.252
+++ simon.cpp	15 Jul 2003 16:40:24 -0000	1.253
@@ -29,6 +29,8 @@
 #include <errno.h>
 #include <time.h>
 
+extern uint16 _debugLevel;
+
 #ifdef _WIN32_WCE
 
 extern bool toolbar_drawn;
@@ -1077,8 +1079,7 @@
 		}
 	}
 
-	if (_debugMode)
-		warning("loadTablesIntoMem: didn't find %d", subr_id);
+		debug(1,"loadTablesIntoMem: didn't find %d", subr_id);
 }
 
 void SimonEngine::playSting(uint a) {
@@ -1124,8 +1125,7 @@
 			return cur;
 	}
 
-	if (_debugMode)
-		warning("getSubroutineByID: subroutine %d not found", subroutine_id);
+	debug(1,"getSubroutineByID: subroutine %d not found", subroutine_id);
 	return NULL;
 }
 
@@ -3646,9 +3646,7 @@
 	h = ha->height;
 
 	if (!(h > 0 && w > 0 && ha->x + w <= 320 && ha->y + h <= 200)) {
-		if (_debugMode)
-			warning("Invalid coordinates in video_toggle_colors (%d,%d,%d,%d)", ha->x, ha->y, ha->width,
-						ha->height);
+		debug(1,"Invalid coordinates in video_toggle_colors (%d,%d,%d,%d)", ha->x, ha->y, ha->width, ha->height);
 		_lock_word &= ~0x8000;
 		return;
 	}
@@ -4728,10 +4726,10 @@
 		if (_game & GF_AMIGA) {
 			if (_game != GAME_SIMON1CD32) {
 				// TODO Add support for decruncher
-				warning("playMusic - Decrunch %dtune attempt", music);
+				debug(1,"playMusic - Decrunch %dtune attempt", music);
 			}
 			// TODO Add Protracker support for simon1amiga/cd32
-			warning("playMusic - Load %dtune attempt", music);
+			debug(1,"playMusic - Load %dtune attempt", music);
 		} else {
 			midi.stop();
 			midi.setLoop (true); // Must do this BEFORE loading music. (GMF may have its own override.)

Index: simon.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.h,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- simon.h	21 Jun 2003 15:42:20 -0000	1.79
+++ simon.h	15 Jul 2003 16:40:24 -0000	1.80
@@ -181,7 +181,6 @@
 
 	bool _mouse_pos_changed;
 	uint16 _debugMode;
-	uint16 _debugLevel;
 	uint16 _language;
 	bool _noSubtitles;
 	bool _start_mainscript;

Index: vga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/vga.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- vga.cpp	15 Jul 2003 15:26:17 -0000	1.68
+++ vga.cpp	15 Jul 2003 16:40:24 -0000	1.69
@@ -658,7 +658,7 @@
 	} else if (state.e & 1) {
 		// FIXME: vc_10_no_depack_swap should be called but is currently not supported
 		//state.depack_src = vc_10_no_depack_swap(state.depack_src);
-		warning("vc_10_no_depack_swap unimpl");
+		debug(1,"vc_10_no_depack_swap unimpl");
 		state.depack_src = vc_10_depack_swap(state.depack_src, width, height);
 	}
 
@@ -869,8 +869,7 @@
 		if (_game & GF_SIMON2 && state.e & 0x4 && _bit_array[10] & 0x800) {
 			state.surf_addr = state.surf2_addr;
 			state.surf_pitch = state.surf2_pitch;
-			if (_debugMode)
-				warning("vc_10_draw: (state.e&0x4)");
+			debug(1,"vc_10_draw: (state.e&0x4)");
 		}
 
 		if (state.e & 0x8) {