aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--simon/simon.cpp16
-rw-r--r--simon/simon.h1
-rw-r--r--simon/vga.cpp5
-rw-r--r--sky/sky.cpp2
-rw-r--r--sky/sky.h1
5 files changed, 11 insertions, 14 deletions
diff --git a/simon/simon.cpp b/simon/simon.cpp
index f8c33d00d5..0f4b44f8d3 100644
--- a/simon/simon.cpp
+++ b/simon/simon.cpp
@@ -29,6 +29,8 @@
#include <errno.h>
#include <time.h>
+extern uint16 _debugLevel;
+
#ifdef _WIN32_WCE
extern bool toolbar_drawn;
@@ -1077,8 +1079,7 @@ void SimonEngine::loadTablesIntoMem(uint subr_id) {
}
}
- 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 @@ Subroutine *SimonEngine::getSubroutineByID(uint subroutine_id) {
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 @@ void SimonEngine::video_toggle_colors(HitArea * ha, byte a, byte b, byte c, byte
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 @@ void SimonEngine::loadMusic (uint music) {
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.)
diff --git a/simon/simon.h b/simon/simon.h
index 852cea12eb..6f1d698b4d 100644
--- a/simon/simon.h
+++ b/simon/simon.h
@@ -181,7 +181,6 @@ protected:
bool _mouse_pos_changed;
uint16 _debugMode;
- uint16 _debugLevel;
uint16 _language;
bool _noSubtitles;
bool _start_mainscript;
diff --git a/simon/vga.cpp b/simon/vga.cpp
index 23f1a1656e..c7d0fa0903 100644
--- a/simon/vga.cpp
+++ b/simon/vga.cpp
@@ -658,7 +658,7 @@ void SimonEngine::vc_10_draw() {
} 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 @@ void SimonEngine::vc_10_draw() {
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) {
diff --git a/sky/sky.cpp b/sky/sky.cpp
index d59d3595b4..01ddd1d41f 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -31,6 +31,8 @@
#include <errno.h>
#include <time.h>
+extern uint16 _debugLevel;
+
#ifdef _WIN32_WCE
extern bool toolbar_drawn;
diff --git a/sky/sky.h b/sky/sky.h
index ea119a43e9..1682a43bb6 100644
--- a/sky/sky.h
+++ b/sky/sky.h
@@ -72,7 +72,6 @@ protected:
bool _floppyIntro;
uint16 _debugMode;
- uint16 _debugLevel;
int _numScreenUpdates;