[Scummvm-git-logs] scummvm master -> 7f85a988c02272919924eba67afa8d127ed87dca
bonki
bonki at users.noreply.github.com
Sun May 6 09:27:01 CEST 2018
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7f85a988c0 Revert "PRINCE: Don't output debug information unless requested"
Commit: 7f85a988c02272919924eba67afa8d127ed87dca
https://github.com/scummvm/scummvm/commit/7f85a988c02272919924eba67afa8d127ed87dca
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-05-06T09:25:31+02:00
Commit Message:
Revert "PRINCE: Don't output debug information unless requested"
This reverts commit dfbf6b7287eacdc41948a6c7b0648f4ecdaa0cbf.
Changed paths:
engines/prince/archive.cpp
engines/prince/hero.cpp
engines/prince/music.cpp
engines/prince/prince.cpp
engines/prince/resource.cpp
engines/prince/script.cpp
engines/prince/sound.cpp
diff --git a/engines/prince/archive.cpp b/engines/prince/archive.cpp
index aba7458..3eb37b6 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 5d19fe3..037f11e 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 58a1c1c..f1846f9 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 ae24576..cb314aa 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 43e6095..ce0396a 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 6035071..d6d3251 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<Mask> &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 e2d7e07..a742005 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;
}
More information about the Scummvm-git-logs
mailing list