From 7f85a988c02272919924eba67afa8d127ed87dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Fr=C3=BChwirth?= Date: Sun, 6 May 2018 09:24:10 +0200 Subject: [PATCH] Revert "PRINCE: Don't output debug information unless requested" This reverts commit dfbf6b7287eacdc41948a6c7b0648f4ecdaa0cbf. --- engines/prince/archive.cpp | 2 +- engines/prince/hero.cpp | 2 +- engines/prince/music.cpp | 2 +- engines/prince/prince.cpp | 2 +- engines/prince/resource.cpp | 6 +++--- engines/prince/script.cpp | 12 ++++++------ engines/prince/sound.cpp | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/engines/prince/archive.cpp b/engines/prince/archive.cpp index aba74588889..3eb37b643a0 100644 --- a/engines/prince/archive.cpp +++ b/engines/prince/archive.cpp @@ -158,7 +158,7 @@ Common::SeekableReadStream *PtcArchive::createReadStreamForMember(const Common:: buffer = decompData; } - //debug(2, "PtcArchive::createReadStreamForMember name %s", name.c_str()); + //debug("PtcArchive::createReadStreamForMember name %s", name.c_str()); return new Common::MemoryReadStream(buffer, size, DisposeAfterUse::YES); } diff --git a/engines/prince/hero.cpp b/engines/prince/hero.cpp index 5d19fe39da4..037f11e95a9 100644 --- a/engines/prince/hero.cpp +++ b/engines/prince/hero.cpp @@ -68,7 +68,7 @@ bool Hero::loadAnimSet(uint32 animSetNr) { _moveSet.resize(kMoveSetSize); for (uint32 i = 0; i < kMoveSetSize; i++) { - debug(2, "Anim set item %d %s", i, animSet[i]); + debug("Anim set item %d %s", i, animSet[i]); Animation *anim = nullptr; if (animSet[i] != nullptr) { anim = new Animation(); diff --git a/engines/prince/music.cpp b/engines/prince/music.cpp index 58a1c1c02a6..f1846f925e1 100644 --- a/engines/prince/music.cpp +++ b/engines/prince/music.cpp @@ -150,7 +150,7 @@ void MusicPlayer::killMidi() { void MusicPlayer::loadMidi(const char *name) { Common::SeekableReadStream *stream = SearchMan.createReadStreamForMember(name); if (!stream) { - warning("Can't load midi stream %s", name); + debug("Can't load midi stream %s", name); return; } diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp index ae2457640c8..cb314aa058f 100644 --- a/engines/prince/prince.cpp +++ b/engines/prince/prince.cpp @@ -63,7 +63,7 @@ void PrinceEngine::debugEngine(const char *s, ...) { vsnprintf(buf, STRINGBUFLEN, s, va); va_end(va); - debug(2, "Prince::Engine %s", buf); + debug("Prince::Engine %s", buf); } PrinceEngine::PrinceEngine(OSystem *syst, const PrinceGameDescription *gameDesc) : diff --git a/engines/prince/resource.cpp b/engines/prince/resource.cpp index 43e609512b2..ce0396a327d 100644 --- a/engines/prince/resource.cpp +++ b/engines/prince/resource.cpp @@ -76,8 +76,8 @@ bool AnimListItem::loadFromStream(Common::SeekableReadStream &stream) { _nextAnim = stream.readUint16LE(); _flags = stream.readUint16LE(); - //debug(2, "AnimListItem type %d, fileNumber %d, x %d, y %d, flags %d", _type, _fileNumber, _x, _y, _flags); - //debug(2, "startPhase %d, endPhase %d, loopPhase %d", _startPhase, _endPhase, _loopPhase); + //debug("AnimListItem type %d, fileNumber %d, x %d, y %d, flags %d", _type, _fileNumber, _x, _y, _flags); + //debug("startPhase %d, endPhase %d, loopPhase %d", _startPhase, _endPhase, _loopPhase); // 32 byte aligment stream.seek(pos + 32); @@ -143,7 +143,7 @@ bool PrinceEngine::loadLocation(uint16 locationNr) { _mobList.clear(); if (getGameType() == kPrinceDataDE) { const Common::String mobLstName = Common::String::format("mob%02d.lst", _locationNr); - debug(2, "name: %s", mobLstName.c_str()); + debug("name: %s", mobLstName.c_str()); Resource::loadResource(_mobList, mobLstName.c_str(), false); } else if (getGameType() == kPrinceDataPL) { Resource::loadResource(_mobList, "mob.lst", false); diff --git a/engines/prince/script.cpp b/engines/prince/script.cpp index 60350719257..d6d325181c6 100644 --- a/engines/prince/script.cpp +++ b/engines/prince/script.cpp @@ -222,7 +222,7 @@ void Script::setObjId(int roomObjOffset, int slot, byte objectId) { } int Script::scanMobEvents(int mobMask, int dataEventOffset) { - debug(2, "mobMask: %d", mobMask); + debug("mobMask: %d", mobMask); int i = 0; int16 mob; int32 code; @@ -230,7 +230,7 @@ int Script::scanMobEvents(int mobMask, int dataEventOffset) { mob = (int)READ_LE_UINT16(&_data[dataEventOffset + i * 6]); if (mob == mobMask) { code = (int)READ_LE_UINT32(&_data[dataEventOffset + i * 6 + 2]); - debug(2, "code: %d", code); + debug("code: %d", code); return code; } i++; @@ -239,7 +239,7 @@ int Script::scanMobEvents(int mobMask, int dataEventOffset) { } int Script::scanMobEventsWithItem(int mobMask, int dataEventOffset, int itemMask) { - debug(2, "mobMask: %d", mobMask); + debug("mobMask: %d", mobMask); int i = 0; int16 mob; int16 item; @@ -250,8 +250,8 @@ int Script::scanMobEventsWithItem(int mobMask, int dataEventOffset, int itemMask item = (int)READ_LE_UINT16(&_data[dataEventOffset + i * 8 + 2]); if (item == itemMask) { code = (int)READ_LE_UINT32(&_data[dataEventOffset + i * 8 + 4]); - debug(2, "itemMask: %d", item); - debug(2, "code: %d", code); + debug("itemMask: %d", item); + debug("code: %d", code); return code; } } @@ -388,7 +388,7 @@ bool Script::loadAllMasks(Common::Array &maskList, int offset) { tempMask._width = 0; tempMask._height = 0; tempMask._data = nullptr; - warning("Can't load %s", msStreamName.c_str()); + debug("Can't load %s", msStreamName.c_str()); delete msStream; } else { msStream = Resource::getDecompressedStream(msStream); diff --git a/engines/prince/sound.cpp b/engines/prince/sound.cpp index e2d7e07139a..a742005571b 100644 --- a/engines/prince/sound.cpp +++ b/engines/prince/sound.cpp @@ -104,7 +104,7 @@ bool PrinceEngine::loadVoice(uint32 slot, uint32 sampleSlot, const Common::Strin freeSample(sampleSlot); Common::SeekableReadStream *sampleStream = SearchMan.createReadStreamForMember(streamName); if (sampleStream == nullptr) { - warning("Can't open %s", streamName.c_str()); + debug("Can't open %s", streamName.c_str()); return false; }