libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-14 21:59:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "PRINCE: Don't output debug information unless requested"

Browse Source 
This reverts commit dfbf6b7287.
This commit is contained in:
Adrian Frühwirth 2018-05-06 09:24:10 +02:00
parent 589f0f8750
commit 7f85a988c0
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/prince/archive.cpp
View File

@ -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);
}

2
engines/prince/hero.cpp
View File

@ -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();

2
engines/prince/music.cpp
View File

@ -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;
}

2
engines/prince/prince.cpp
View File

@ -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) :

6
engines/prince/resource.cpp
View File

@ -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);

12
engines/prince/script.cpp
View File

@ -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);

2
engines/prince/sound.cpp
View File

@ -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;
}