aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/agi/loader_v3.cpp2
-rw-r--r--engines/agi/objects.cpp3
-rw-r--r--engines/agi/predictive.cpp2
-rw-r--r--engines/agos/debug.cpp72
-rw-r--r--engines/agos/midi.cpp8
-rw-r--r--engines/agos/subroutine.cpp2
-rw-r--r--engines/agos/vga.cpp4
-rw-r--r--engines/agos/vga_ff.cpp4
-rw-r--r--engines/parallaction/font.cpp4
-rw-r--r--engines/parallaction/parser_ns.cpp3
-rw-r--r--engines/queen/logic.cpp6
-rw-r--r--engines/scumm/boxes.cpp24
-rw-r--r--engines/scumm/charset-fontdata.cpp10
-rw-r--r--engines/scumm/costume.cpp2
-rw-r--r--engines/scumm/he/resource_he.cpp2
-rw-r--r--engines/scumm/resource_v2.cpp12
-rw-r--r--engines/scumm/script.cpp10
-rw-r--r--engines/scumm/script_v8.cpp2
-rw-r--r--engines/scumm/scumm.cpp3
-rw-r--r--engines/sky/disk.cpp2
-rw-r--r--engines/sky/logic.cpp2
-rw-r--r--engines/toon/script_func.cpp8
22 files changed, 91 insertions, 96 deletions
diff --git a/engines/agi/loader_v3.cpp b/engines/agi/loader_v3.cpp
index f145140768..18ea4cae7d 100644
--- a/engines/agi/loader_v3.cpp
+++ b/engines/agi/loader_v3.cpp
@@ -121,7 +121,7 @@ int AgiLoader_v3::init() {
}
if (!fp.open(path)) {
- printf("Failed to open \"%s\"\n", path.c_str());
+ warning("Failed to open '%s'", path.c_str());
return errBadFileOpen;
}
// build offset table for v3 directory format
diff --git a/engines/agi/objects.cpp b/engines/agi/objects.cpp
index 8de36f24e1..d942a2b538 100644
--- a/engines/agi/objects.cpp
+++ b/engines/agi/objects.cpp
@@ -74,8 +74,7 @@ int AgiEngine::decodeObjects(uint8 *mem, uint32 flen) {
if ((uint) offset < flen) {
(_objects + i)->name = (char *)strdup((const char *)mem + offset);
} else {
- printf("ERROR: object %i name beyond object filesize! "
- "(%04x > %04x)\n", i, offset, flen);
+ warning("object %i name beyond object filesize (%04x > %04x)", i, offset, flen);
(_objects + i)->name = strdup("");
}
}
diff --git a/engines/agi/predictive.cpp b/engines/agi/predictive.cpp
index 414477a381..250ac1df22 100644
--- a/engines/agi/predictive.cpp
+++ b/engines/agi/predictive.cpp
@@ -546,7 +546,7 @@ void AgiEngine::loadDict() {
#endif
uint32 time3 = _system->getMillis();
- printf("Time to parse pred.dic: %d, total: %d\n", time3-time2, time3-time1);
+ debug("Time to parse pred.dic: %d, total: %d", time3-time2, time3-time1);
}
bool AgiEngine::matchWord() {
diff --git a/engines/agos/debug.cpp b/engines/agos/debug.cpp
index 519dfc344c..cb11d65218 100644
--- a/engines/agos/debug.cpp
+++ b/engines/agos/debug.cpp
@@ -76,30 +76,30 @@ const byte *AGOSEngine::dumpOpcode(const byte *p) {
while (*st != '|')
st++;
- printf("%s ", st + 1);
+ debugN("%s ", st + 1);
for (;;) {
switch (*s++) {
case 'x':
- printf("\n");
+ debugN("\n");
return NULL;
case '|':
- printf("\n");
+ debugN("\n");
return p;
case 'B':{
byte b = *p++;
if (b == 255)
- printf("[%d] ", *p++);
+ debugN("[%d] ", *p++);
else
- printf("%d ", b);
+ debugN("%d ", b);
break;
}
case 'V':{
byte b = *p++;
if (b == 255)
- printf("[[%d]] ", *p++);
+ debugN("[[%d]] ", *p++);
else
- printf("[%d] ", b);
+ debugN("[%d] ", b);
break;
}
@@ -108,15 +108,15 @@ const byte *AGOSEngine::dumpOpcode(const byte *p) {
p += 2;
if (getGameType() == GType_PP) {
if (n >= 60000 && n < 62048)
- printf("[%d] ", n - 60000);
+ debugN("[%d] ", n - 60000);
else
- printf("%d ", n);
+ debugN("%d ", n);
} else {
if (n >= 30000 && n < 30512)
- printf("[%d] ", n - 30000);
+ debugN("[%d] ", n - 30000);
else
- printf("%d ", n);
+ debugN("%d ", n);
}
break;
}
@@ -124,7 +124,7 @@ const byte *AGOSEngine::dumpOpcode(const byte *p) {
case 'w':{
int n = (int16)READ_BE_UINT16(p);
p += 2;
- printf("%d ", n);
+ debugN("%d ", n);
break;
}
@@ -132,22 +132,22 @@ const byte *AGOSEngine::dumpOpcode(const byte *p) {
int n = (int16)READ_BE_UINT16(p);
p += 2;
if (n == -1)
- printf("SUBJECT_ITEM ");
+ debugN("SUBJECT_ITEM ");
else if (n == -3)
- printf("OBJECT_ITEM ");
+ debugN("OBJECT_ITEM ");
else if (n == -5)
- printf("ME_ITEM ");
+ debugN("ME_ITEM ");
else if (n == -7)
- printf("ACTOR_ITEM ");
+ debugN("ACTOR_ITEM ");
else if (n == -9)
- printf("ITEM_A_PARENT ");
+ debugN("ITEM_A_PARENT ");
else
- printf("<%d> ", n);
+ debugN("<%d> ", n);
break;
}
case 'J':{
- printf("-> ");
+ debugN("-> ");
}
break;
@@ -155,9 +155,9 @@ const byte *AGOSEngine::dumpOpcode(const byte *p) {
uint n = READ_BE_UINT16(p);
p += 2;
if (n != 0xFFFF)
- printf("\"%s\"(%d) ", getStringPtrByID(n), n);
+ debugN("\"%s\"(%d) ", getStringPtrByID(n), n);
else
- printf("NULL_STRING ");
+ debugN("NULL_STRING ");
}
break;
}
@@ -167,11 +167,11 @@ const byte *AGOSEngine::dumpOpcode(const byte *p) {
void AGOSEngine::dumpSubroutineLine(SubroutineLine *sl, Subroutine *sub) {
const byte *p;
- printf("; ****\n");
+ debugN("; ****\n");
p = (byte *)sl + SUBROUTINE_LINE_SMALL_SIZE;
if (sub->id == 0) {
- printf("; verb=%d, noun1=%d, noun2=%d\n", sl->verb, sl->noun1, sl->noun2);
+ debugN("; verb=%d, noun1=%d, noun2=%d\n", sl->verb, sl->noun1, sl->noun2);
p = (byte *)sl + SUBROUTINE_LINE_BIG_SIZE;
}
@@ -185,12 +185,12 @@ void AGOSEngine::dumpSubroutineLine(SubroutineLine *sl, Subroutine *sub) {
void AGOSEngine::dumpSubroutine(Subroutine *sub) {
SubroutineLine *sl;
- printf("\n******************************************\n;Subroutine, ID=%d:\nSUB_%d:\n", sub->id, sub->id);
+ debugN("\n******************************************\n;Subroutine, ID=%d:\nSUB_%d:\n", sub->id, sub->id);
sl = (SubroutineLine *)((byte *)sub + sub->first);
for (; (byte *)sl != (byte *)sub; sl = (SubroutineLine *)((byte *)sub + sl->next)) {
dumpSubroutineLine(sl, sub);
}
- printf("\nEND ******************************************\n");
+ debugN("\nEND ******************************************\n");
}
void AGOSEngine::dumpSubroutines() {
@@ -245,35 +245,35 @@ void AGOSEngine::dumpVideoScript(const byte *src, bool singeOpcode) {
while (*strn != '|')
strn++;
- printf("%.2d: %s ", opcode, strn + 1);
+ debugN("%.2d: %s ", opcode, strn + 1);
int end = (getGameType() == GType_FF || getGameType() == GType_PP) ? 9999 : 999;
for (; *str != '|'; str++) {
switch (*str) {
case 'x':
- printf("\n");
+ debugN("\n");
return;
case 'b':
- printf("%d ", *src++);
+ debugN("%d ", *src++);
break;
case 'd':
- printf("%d ", (int16)readUint16Wrapper(src));
+ debugN("%d ", (int16)readUint16Wrapper(src));
src += 2;
break;
case 'v':
- printf("[%d] ", readUint16Wrapper(src));
+ debugN("[%d] ", readUint16Wrapper(src));
src += 2;
break;
case 'i':
- printf("%d ", (int16)readUint16Wrapper(src));
+ debugN("%d ", (int16)readUint16Wrapper(src));
src += 2;
break;
case 'j':
- printf("-> ");
+ debugN("-> ");
break;
case 'q':
while (readUint16Wrapper(src) != end) {
- printf("(%d,%d) ", readUint16Wrapper(src),
+ debugN("(%d,%d) ", readUint16Wrapper(src),
readUint16Wrapper(src + 2));
src += 4;
}
@@ -284,7 +284,7 @@ void AGOSEngine::dumpVideoScript(const byte *src, bool singeOpcode) {
}
}
- printf("\n");
+ debugN("\n");
} while (!singeOpcode);
}
@@ -293,10 +293,10 @@ void AGOSEngine::dumpVgaScript(const byte *ptr, uint16 res, uint16 id) {
}
void AGOSEngine::dumpVgaScriptAlways(const byte *ptr, uint16 res, uint16 id) {
- printf("; address=%x, vgafile=%d vgasprite=%d\n",
+ debugN("; address=%x, vgafile=%d vgasprite=%d\n",
(unsigned int)(ptr - _vgaBufferPointers[res].vgaFile1), res, id);
dumpVideoScript(ptr, false);
- printf("; end\n");
+ debugN("; end\n");
}
void AGOSEngine::dumpAllVgaImageFiles() {
diff --git a/engines/agos/midi.cpp b/engines/agos/midi.cpp
index 858307685c..fe2d1cd25b 100644
--- a/engines/agos/midi.cpp
+++ b/engines/agos/midi.cpp
@@ -226,7 +226,7 @@ void MidiPlayer::startTrack(int track) {
parser->setMidiDriver(this);
parser->setTimerRate(_driver->getBaseTempo());
if (!parser->loadMusic(_music.songs[track], _music.song_sizes[track])) {
- printf ("Error reading track!\n");
+ warning("Error reading track %d", track);
delete parser;
parser = 0;
}
@@ -455,7 +455,7 @@ void MidiPlayer::loadSMF(Common::File *in, int song, bool sfx) {
parser->setMidiDriver(this);
parser->setTimerRate(timerRate);
if (!parser->loadMusic(p->data, size)) {
- printf("Error reading track!\n");
+ warning("Error reading track");
delete parser;
parser = 0;
}
@@ -484,7 +484,7 @@ void MidiPlayer::loadMultipleSMF(Common::File *in, bool sfx) {
p->num_songs = in->readByte();
if (p->num_songs > 16) {
- printf ("playMultipleSMF: %d is too many songs to keep track of!\n", (int)p->num_songs);
+ warning("playMultipleSMF: %d is too many songs to keep track of", (int)p->num_songs);
return;
}
@@ -496,7 +496,7 @@ void MidiPlayer::loadMultipleSMF(Common::File *in, bool sfx) {
// Make sure there's a MThd
in->read(buf, 4);
if (memcmp(buf, "MThd", 4)) {
- printf("Expected MThd but found '%c%c%c%c' instead!\n", buf[0], buf[1], buf[2], buf[3]);
+ warning("Expected MThd but found '%c%c%c%c' instead", buf[0], buf[1], buf[2], buf[3]);
return;
}
in->seek(in->readUint32BE(), SEEK_CUR);
diff --git a/engines/agos/subroutine.cpp b/engines/agos/subroutine.cpp
index 076e562a76..733d40e52d 100644
--- a/engines/agos/subroutine.cpp
+++ b/engines/agos/subroutine.cpp
@@ -570,7 +570,7 @@ restart:
_codePtr += 8;
if (_dumpOpcodes)
- printf("; %d\n", sub->id);
+ debug("; %d", sub->id);
result = runScript();
if (result != 0) {
break;
diff --git a/engines/agos/vga.cpp b/engines/agos/vga.cpp
index dd2df79c07..8b8b16c9bb 100644
--- a/engines/agos/vga.cpp
+++ b/engines/agos/vga.cpp
@@ -155,7 +155,7 @@ void AGOSEngine::runVgaScript() {
if (_dumpVgaOpcodes) {
if (_vcPtr != (const byte *)&_vcGetOutOfCode) {
- printf("%.5d %.5X: %5d %4d ", _vgaTickCounter, (unsigned int)(_vcPtr - _curVgaFile1), _vgaCurSpriteId, _vgaCurZoneNum);
+ debugN("%.5d %.5X: %5d %4d ", _vgaTickCounter, (unsigned int)(_vcPtr - _curVgaFile1), _vgaCurSpriteId, _vgaCurZoneNum);
dumpVideoScript(_vcPtr, true);
}
}
@@ -383,7 +383,7 @@ void AGOSEngine::vcSkipNextInstruction() {
}
if (_dumpVgaOpcodes)
- printf("; skipped\n");
+ debugN("; skipped\n");
}
// VGA Script commands
diff --git a/engines/agos/vga_ff.cpp b/engines/agos/vga_ff.cpp
index 0a6458ac11..38a3479292 100644
--- a/engines/agos/vga_ff.cpp
+++ b/engines/agos/vga_ff.cpp
@@ -405,9 +405,9 @@ void AGOSEngine_PuzzlePack::vc63_fastFadeIn() {
if (getBitFlag(100)) {
startOverlayAnims();
} else if (getBitFlag(103)) {
- printf("NameAndTime\n");
+ debug("vc63_fastFadeIn: NameAndTime");
} else if (getBitFlag(104)) {
- printf("HiScoreTable\n");
+ debug("vc63_fastFadeIn: HiScoreTable");
}
}
diff --git a/engines/parallaction/font.cpp b/engines/parallaction/font.cpp
index d1c67f1338..bf2bf6d419 100644
--- a/engines/parallaction/font.cpp
+++ b/engines/parallaction/font.cpp
@@ -574,7 +574,7 @@ void AmigaFont::blitData(byte c) {
}
uint16 AmigaFont::width(byte c) {
-// printf("kern(%i) = %i, space(%i) = %i\t", c, getKerning(c), c, getSpacing(c));
+// debug("kern(%i) = %i, space(%i) = %i\t", c, getKerning(c), c, getSpacing(c));
return getKerning(c) + getSpacing(c);
}
@@ -642,7 +642,7 @@ Font *AmigaDisk_ns::createFont(const char *name, Common::SeekableReadStream &str
}
Font *DosDisk_br::createFont(const char *name, Common::ReadStream &stream) {
-// printf("DosDisk_br::createFont(%s)\n", name);
+// debug("DosDisk_br::createFont(%s)", name);
Font *font;
if (_vm->getFeatures() & GF_DEMO) {
diff --git a/engines/parallaction/parser_ns.cpp b/engines/parallaction/parser_ns.cpp
index ff24a06ceb..994cfa46fb 100644
--- a/engines/parallaction/parser_ns.cpp
+++ b/engines/parallaction/parser_ns.cpp
@@ -23,7 +23,6 @@
*
*/
-
#include "parallaction/parallaction.h"
#include "parallaction/parser.h"
#include "parallaction/sound.h"
@@ -1284,7 +1283,7 @@ DECLARE_ZONE_PARSER(commands) {
DECLARE_ZONE_PARSER(label) {
debugC(7, kDebugParser, "ZONE_PARSER(label) ");
-// printf("label: %s", _tokens[1]);
+// debug("label: %s", _tokens[1]);
ctxt.z->_label = _vm->_gfx->renderFloatingLabel(_vm->_labelFont, _tokens[1]);
ctxt.z->_flags &= ~kFlagsNoName;
}
diff --git a/engines/queen/logic.cpp b/engines/queen/logic.cpp
index 053312c584..de254300b6 100644
--- a/engines/queen/logic.cpp
+++ b/engines/queen/logic.cpp
@@ -1550,7 +1550,7 @@ void Logic::asmEndGame() {
while (n--) {
_vm->update();
}
-// printf("Game completed.");
+// debug("Game completed.");
_vm->quitGame();
}
@@ -2004,7 +2004,7 @@ void Logic::asmPanLeftToBomb() {
}
void Logic::asmEndDemo() {
-// printf("Flight of the Amazon Queen, released January 95.");
+// debug("Flight of the Amazon Queen, released January 95.");
_vm->quitGame();
}
@@ -2049,7 +2049,7 @@ void Logic::asmInterviewIntro() {
}
void Logic::asmEndInterview() {
-// printf("Interactive Interview copyright (c) 1995, IBI.");
+// debug("Interactive Interview copyright (c) 1995, IBI.");
_vm->quitGame();
}
diff --git a/engines/scumm/boxes.cpp b/engines/scumm/boxes.cpp
index fb8e128415..15d5f04ed5 100644
--- a/engines/scumm/boxes.cpp
+++ b/engines/scumm/boxes.cpp
@@ -921,32 +921,32 @@ bool Actor::findPathTowards(byte box1nr, byte box2nr, byte box3nr, Common::Point
static void printMatrix(byte *boxm, int num) {
int i;
for (i = 0; i < num; i++) {
- printf("%d: ", i);
+ debugN("%d: ", i);
while (*boxm != 0xFF) {
- printf("%d, ", *boxm);
+ debug("%d, ", *boxm);
boxm++;
}
boxm++;
- printf("\n");
+ debug("\n");
}
}
static void printMatrix2(byte *matrix, int num) {
int i, j;
- printf(" ");
+ debug(" ");
for (i = 0; i < num; i++)
- printf("%2d ", i);
- printf("\n");
+ debug("%2d ", i);
+ debug("\n");
for (i = 0; i < num; i++) {
- printf("%2d: ", i);
+ debug("%2d: ", i);
for (j = 0; j < num; j++) {
int val = matrix[i * num + j];
if (val == Actor::kInvalidBox)
- printf(" ? ");
+ debug(" ? ");
else
- printf("%2d ", val);
+ debug("%2d ", val);
}
- printf("\n");
+ debug("\n");
}
}
#endif
@@ -1053,9 +1053,9 @@ void ScummEngine::createBoxMatrix() {
#if BOX_DEBUG
- printf("Itinerary matrix:\n");
+ debug("Itinerary matrix:\n");
printMatrix2(itineraryMatrix, num);
- printf("compressed matrix:\n");
+ debug("compressed matrix:\n");
printMatrix(getBoxMatrixBaseAddr(), num);
#endif
diff --git a/engines/scumm/charset-fontdata.cpp b/engines/scumm/charset-fontdata.cpp
index 904e40d9ea..378e8e9d8d 100644
--- a/engines/scumm/charset-fontdata.cpp
+++ b/engines/scumm/charset-fontdata.cpp
@@ -589,20 +589,20 @@ CharsetRendererV2::CharsetRendererV2(ScummEngine *vm, Common::Language language)
b = data[offset+3];
len = data[offset+4];
while (len--) {
- printf("0x%02x, ", b);
+ debugN("0x%02x, ", b);
count++;
if (count % 8 == 0)
- printf("\n");
+ debugN("\n");
}
offset += 6;
} else {
- printf("0x%02x, ", data[offset]);
+ debugN("0x%02x, ", data[offset]);
count++;
if (count % 8 == 0)
- printf("\n");
+ debugN("\n");
}
}
- printf("\n");
+ debugN("\n");
_vm->_system->quit();
#endif
}
diff --git a/engines/scumm/costume.cpp b/engines/scumm/costume.cpp
index d0d8eb2240..cd366fcfd4 100644
--- a/engines/scumm/costume.cpp
+++ b/engines/scumm/costume.cpp
@@ -648,7 +648,7 @@ void ClassicCostumeRenderer::procPCEngine(Codec1 &v1) {
}
}
if (index != 128) {
- printf("%d\n", index);
+ warning("ClassicCostumeRenderer::procPCEngine: index %d != 128\n", index);
}
for (int row = 0; row < 16; ++row) {
diff --git a/engines/scumm/he/resource_he.cpp b/engines/scumm/he/resource_he.cpp
index b42441ceaf..f7a7d3a567 100644
--- a/engines/scumm/he/resource_he.cpp
+++ b/engines/scumm/he/resource_he.cpp
@@ -358,7 +358,7 @@ byte *Win32ResExtractor::extract_group_icon_cursor_resource(WinLibrary *fi, WinR
WinResource *fwr;
RETURN_IF_BAD_POINTER(NULL, icondir->entries[c]);
- /*printf("%d. bytes_in_res=%d width=%d height=%d planes=%d bit_count=%d\n", c,
+ /*debug("%d. bytes_in_res=%d width=%d height=%d planes=%d bit_count=%d", c,
FROM_LE_32(icondir->entries[c].bytes_in_res),
(is_icon ? icondir->entries[c].res_info.icon.width : FROM_LE_16(icondir->entries[c].res_info.cursor.width)),
(is_icon ? icondir->entries[c].res_info.icon.height : FROM_LE_16(icondir->entries[c].res_info.cursor.height)),
diff --git a/engines/scumm/resource_v2.cpp b/engines/scumm/resource_v2.cpp
index e469c721b1..3dc3b4d14e 100644
--- a/engines/scumm/resource_v2.cpp
+++ b/engines/scumm/resource_v2.cpp
@@ -23,8 +23,6 @@
*
*/
-
-
#include "scumm/file.h"
#include "scumm/scumm_v2.h"
#include "scumm/resource.h"
@@ -175,24 +173,24 @@ void ScummEngine_v2::readIndexFile() {
switch (magic) {
case 0x0100:
- printf("Enhanced V2 game detected\n");
+ debug("Enhanced V2 game detected");
assert(_game.version == 2);
readEnhancedIndexFile();
break;
case 0x0A31:
- printf("Classic V1 game detected\n");
+ debug("Classic V1 game detected");
assert(_game.version == 1);
readClassicIndexFile();
break;
case 0x4643:
if (!(_game.platform == Common::kPlatformNES))
error("Use maniac target");
- printf("NES V1 game detected\n");
+ debug("NES V1 game detected");
assert(_game.version == 1);
readClassicIndexFile();
break;
case 0x132:
- printf("C64 V1 game detected\n");
+ debug("C64 V1 game detected");
if (_game.id == GID_MANIAC) {
assert(_game.version == 0);
} else {
@@ -201,7 +199,7 @@ void ScummEngine_v2::readIndexFile() {
readClassicIndexFile();
break;
case 0x032:
- printf("Apple II V1 game detected\n");
+ debug("Apple II V1 game detected");
assert(_game.version == 0);
readClassicIndexFile();
break;
diff --git a/engines/scumm/script.cpp b/engines/scumm/script.cpp
index b6058d4d9a..eac2061560 100644
--- a/engines/scumm/script.cpp
+++ b/engines/scumm/script.cpp
@@ -467,11 +467,11 @@ void ScummEngine::executeScript() {
while (_currentScript != 0xFF) {
if (_showStack == 1) {
- printf("Stack:");
+ debugN("Stack:");
for (c = 0; c < _scummStackPos; c++) {
- printf(" %d", _vmStack[c]);
+ debugN(" %d", _vmStack[c]);
}
- printf("\n");
+ debugN("\n");
}
_opcode = fetchScriptByte();
if (_game.version > 2) // V0-V2 games didn't use the didexec flag
@@ -483,9 +483,9 @@ void ScummEngine::executeScript() {
getOpcodeDesc(_opcode));
if (_hexdumpScripts == true) {
for (c = -1; c < 15; c++) {
- printf(" %02x", *(_scriptPointer + c));
+ debugN(" %02x", *(_scriptPointer + c));
}
- printf("\n");
+ debugN("\n");
}
executeOpcode(_opcode);
diff --git a/engines/scumm/script_v8.cpp b/engines/scumm/script_v8.cpp
index 4d552a9429..f2addff19f 100644
--- a/engines/scumm/script_v8.cpp
+++ b/engines/scumm/script_v8.cpp
@@ -766,7 +766,6 @@ void ScummEngine_v8::o8_actorOps() {
if (subOp == 0x7A) {
_curActor = pop();
- //printf("Setting current actor to %d\n", _curActor);
return;
}
@@ -937,7 +936,6 @@ void ScummEngine_v8::o8_verbOps() {
_curVerb = pop();
_curVerbSlot = getVerbSlot(_curVerb, 0);
assertRange(0, _curVerbSlot, _numVerbs - 1, "new verb slot");
- //printf("Setting current actor to %d\n", _curActor);
return;
}
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 42be33fff3..405c81f91b 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -485,7 +485,8 @@ ScummEngine::ScummEngine(OSystem *syst, const DetectorResult &dr)
if (ConfMan.getBool("demo_mode"))
_game.features |= GF_DEMO;
if (ConfMan.hasKey("nosubtitles")) {
- printf("Configuration key 'nosubtitles' is deprecated. Use 'subtitles' instead\n");
+ // We replaced nosubtitles *ages* ago. Just convert it silently
+ debug("Configuration key 'nosubtitles' is deprecated. Converting to 'subtitles'");
if (!ConfMan.hasKey("subtitles"))
ConfMan.setBool("subtitles", !ConfMan.getBool("nosubtitles"));
}
diff --git a/engines/sky/disk.cpp b/engines/sky/disk.cpp
index 90b55133ed..5ad0c3eb19 100644
--- a/engines/sky/disk.cpp
+++ b/engines/sky/disk.cpp
@@ -59,7 +59,7 @@ Disk::Disk() {
if (!_dataDiskHandle->isOpen())
error("Error opening %s", dataFilename);
- printf("Found BASS version v0.0%d (%d dnr entries)\n", determineGameVersion(), _dinnerTableEntries);
+ debug("Found BASS version v0.0%d (%d dnr entries)", determineGameVersion(), _dinnerTableEntries);
memset(_buildList, 0, 60 * 2);
memset(_loadedFilesList, 0, 60 * 4);
diff --git a/engines/sky/logic.cpp b/engines/sky/logic.cpp
index e19cbb27e8..1c1e2c9682 100644
--- a/engines/sky/logic.cpp
+++ b/engines/sky/logic.cpp
@@ -2510,7 +2510,7 @@ bool Logic::fnUnPauseFx(uint32 a, uint32 b, uint32 c) {
}
bool Logic::fnPrintf(uint32 a, uint32 b, uint32 c) {
- printf("fnPrintf: %d\n", a);
+ debug("fnPrintf(%d, %d, %d)", a, b, c);
return true;
}
diff --git a/engines/toon/script_func.cpp b/engines/toon/script_func.cpp
index f571f324ef..c62211a1ae 100644
--- a/engines/toon/script_func.cpp
+++ b/engines/toon/script_func.cpp
@@ -1072,25 +1072,25 @@ int32 ScriptFunc::sys_Cmd_Play_Sfx(EMCState *state) {
}
int32 ScriptFunc::sys_Cmd_Set_Ambient_Sfx(EMCState *state) {
- //printf("Ambient Sfx : %d %d %d %d\n", stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+ //debug("Ambient Sfx : %d %d %d %d", stackPos(0), stackPos(1), stackPos(2), stackPos(3));
_vm->getAudioManager()->startAmbientSFX(stackPos(0), stackPos(1), stackPos(2), stackPos(3));
return 0;
}
int32 ScriptFunc::sys_Cmd_Kill_Ambient_Sfx(EMCState *state) {
- //printf("Kill Sfx : %d \n", stackPos(0));
+ //debug("Kill Sfx : %d", stackPos(0));
_vm->getAudioManager()->killAmbientSFX(stackPos(0));
return 0;
}
int32 ScriptFunc::sys_Cmd_Set_Ambient_Sfx_Plus(EMCState *state) {
- //printf("Ambient Sfx Plus: %d %d %d %d %d %d %d %d\n", stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7));
+ //debug("Ambient Sfx Plus: %d %d %d %d %d %d %d %d", stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7));
_vm->getAudioManager()->startAmbientSFX(stackPos(0), stackPos(1), stackPos(2), stackPos(3));
return 0;
}
int32 ScriptFunc::sys_Cmd_Set_Ambient_Volume(EMCState *state) {
- //printf("Ambient Volume : %d %d \n", stackPos(0), stackPos(1));
+ //debug("Ambient Volume : %d %d", stackPos(0), stackPos(1));
_vm->getAudioManager()->setAmbientSFXVolume(stackPos(0), stackPos(1));
return 0;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 21:42:41 +0000