[Scummvm-git-logs] scummvm master -> 9a5ba52e6b0865c11258d0fec27796279ff83c34
sev-
sev at scummvm.org
Sun May 6 19:33:56 CEST 2018
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e6ce8f8130 PRINCE: Added more debug output
ba666dfc32 PRINCE: Fixed game type for bundled Russian version
c6872dcf52 PRINCE: Added more debug output
9a5ba52e6b PRINCE: Cleanup debug output
Commit: e6ce8f8130e54c2ca93ee064e309a756093f442c
https://github.com/scummvm/scummvm/commit/e6ce8f8130e54c2ca93ee064e309a756093f442c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-05-06T19:33:44+02:00
Commit Message:
PRINCE: Added more debug output
Changed paths:
engines/prince/archive.cpp
diff --git a/engines/prince/archive.cpp b/engines/prince/archive.cpp
index 3eb37b6..aaf3a9d 100644
--- a/engines/prince/archive.cpp
+++ b/engines/prince/archive.cpp
@@ -135,6 +135,8 @@ Common::SeekableReadStream *PtcArchive::createReadStreamForMember(const Common::
return 0;
}
+ debug(8, "PtcArchive::createReadStreamForMember(%s)", name.c_str());
+
const FileEntry &entryHeader = _items[name];
if (entryHeader._size < 4)
@@ -156,6 +158,8 @@ Common::SeekableReadStream *PtcArchive::createReadStreamForMember(const Common::
free(buffer);
size = decompLen;
buffer = decompData;
+
+ debug(8, "PtcArchive::createReadStreamForMember: decompressed %d to %d bytes", entryHeader._size, decompLen);
}
//debug("PtcArchive::createReadStreamForMember name %s", name.c_str());
Commit: ba666dfc32f472e79cb1d0a9fbe969f1a62d0e1e
https://github.com/scummvm/scummvm/commit/ba666dfc32f472e79cb1d0a9fbe969f1a62d0e1e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-05-06T19:33:44+02:00
Commit Message:
PRINCE: Fixed game type for bundled Russian version
Changed paths:
engines/prince/detection.cpp
diff --git a/engines/prince/detection.cpp b/engines/prince/detection.cpp
index 0149a4b..2147c23 100644
--- a/engines/prince/detection.cpp
+++ b/engines/prince/detection.cpp
@@ -101,7 +101,7 @@ static const PrinceGameDescription gameDescriptions[] = {
ADGF_TESTING | GF_NOVOICES,
GUIO1(GUIO_NONE)
},
- kPrinceDataPL
+ kPrinceDataDE
},
{
{
Commit: c6872dcf5299ef22a1ca0bfe7bbc2296f2e98868
https://github.com/scummvm/scummvm/commit/c6872dcf5299ef22a1ca0bfe7bbc2296f2e98868
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-05-06T19:33:44+02:00
Commit Message:
PRINCE: Added more debug output
Changed paths:
engines/prince/resource.cpp
diff --git a/engines/prince/resource.cpp b/engines/prince/resource.cpp
index ce0396a..d264540 100644
--- a/engines/prince/resource.cpp
+++ b/engines/prince/resource.cpp
@@ -52,6 +52,8 @@ Common::SeekableReadStream *Resource::getDecompressedStream(Common::SeekableRead
dec.decompress(buffer + 18, decompData, decompLen);
free(buffer);
+ debug(8, "Resource::getDecompressedStream: decompressed %d to %d bytes", stream->size(), decompLen);
+
return new Common::MemoryReadStream(decompData, decompLen, DisposeAfterUse::YES);
} else {
return stream;
@@ -143,7 +145,7 @@ bool PrinceEngine::loadLocation(uint16 locationNr) {
_mobList.clear();
if (getGameType() == kPrinceDataDE) {
const Common::String mobLstName = Common::String::format("mob%02d.lst", _locationNr);
- debug("name: %s", mobLstName.c_str());
+ debug(3, "moblist name: %s", mobLstName.c_str());
Resource::loadResource(_mobList, mobLstName.c_str(), false);
} else if (getGameType() == kPrinceDataPL) {
Resource::loadResource(_mobList, "mob.lst", false);
Commit: 9a5ba52e6b0865c11258d0fec27796279ff83c34
https://github.com/scummvm/scummvm/commit/9a5ba52e6b0865c11258d0fec27796279ff83c34
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2018-05-06T19:33:45+02:00
Commit Message:
PRINCE: Cleanup debug output
Changed paths:
engines/prince/archive.cpp
engines/prince/hero.cpp
engines/prince/music.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 aaf3a9d..0ed6e8c 100644
--- a/engines/prince/archive.cpp
+++ b/engines/prince/archive.cpp
@@ -162,8 +162,6 @@ Common::SeekableReadStream *PtcArchive::createReadStreamForMember(const Common::
debug(8, "PtcArchive::createReadStreamForMember: decompressed %d to %d bytes", entryHeader._size, decompLen);
}
- //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 037f11e..8ade649 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("Anim set item %d %s", i, animSet[i]);
+ debug(5, "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 f1846f9..58a1c1c 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) {
- debug("Can't load midi stream %s", name);
+ warning("Can't load midi stream %s", name);
return;
}
diff --git a/engines/prince/resource.cpp b/engines/prince/resource.cpp
index d264540..34de29b 100644
--- a/engines/prince/resource.cpp
+++ b/engines/prince/resource.cpp
@@ -78,8 +78,8 @@ bool AnimListItem::loadFromStream(Common::SeekableReadStream &stream) {
_nextAnim = stream.readUint16LE();
_flags = stream.readUint16LE();
- //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);
+ debug(7, "AnimListItem type %d, fileNumber %d, x %d, y %d, flags %d", _type, _fileNumber, _x, _y, _flags);
+ debug(7, "startPhase %d, endPhase %d, loopPhase %d", _startPhase, _endPhase, _loopPhase);
// 32 byte aligment
stream.seek(pos + 32);
diff --git a/engines/prince/script.cpp b/engines/prince/script.cpp
index d6d3251..2581dde 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("mobMask: %d", mobMask);
+ debug(3, "scanMobEvents: 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("code: %d", code);
+ debug(3, "scanMobEvents: 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("mobMask: %d", mobMask);
+ debug(3, "scanMobEventsWithItem: 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("itemMask: %d", item);
- debug("code: %d", code);
+ debug(3, "scanMobEventsWithItem: itemMask: %d", item);
+ debug(3, "scanMobEventsWithItem: 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;
- debug("Can't load %s", msStreamName.c_str());
+ warning("loadAllMasks: Can't load %s", msStreamName.c_str());
delete msStream;
} else {
msStream = Resource::getDecompressedStream(msStream);
@@ -452,11 +452,9 @@ void Interpreter::debugInterpreter(const char *s, ...) {
Common::String str = Common::String::format("@0x%08X: ", _lastInstruction);
str += Common::String::format("op %04d: ", _lastOpcode);
- //debugC(10, DebugChannel::kScript, "PrinceEngine::Script %s %s", str.c_str(), buf);
if (!strcmp(_mode, "fg")) {
debug(10, "PrinceEngine::Script %s %s", str.c_str(), buf);
}
- //debug("Prince::Script mode %s %s %s", _mode, str.c_str(), buf);
}
void Interpreter::stepBg() {
diff --git a/engines/prince/sound.cpp b/engines/prince/sound.cpp
index a742005..4998386 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) {
- debug("Can't open %s", streamName.c_str());
+ warning("loadVoice: Can't open %s", streamName.c_str());
return false;
}
More information about the Scummvm-git-logs
mailing list