aboutsummaryrefslogtreecommitdiff
path: root/engines/fullpipe
diff options
context:
space:
mode:
authorEugene Sandulenko2017-12-08 20:54:22 +0000
committerEugene Sandulenko2017-12-08 23:57:48 +0100
commit1408ffc4273945abc882033b9aabde82b3d2f841 (patch)
tree102b075ca76c572aeb094abd1cad8ffaf3c924e5 /engines/fullpipe
parentc728c29857d12ddc039a2982b9bd510ed6a9f620 (diff)
downloadscummvm-rg350-1408ffc4273945abc882033b9aabde82b3d2f841.tar.gz
scummvm-rg350-1408ffc4273945abc882033b9aabde82b3d2f841.tar.bz2
scummvm-rg350-1408ffc4273945abc882033b9aabde82b3d2f841.zip
FULLPIPE: Better debug output for movement
Diffstat (limited to 'engines/fullpipe')
-rw-r--r--engines/fullpipe/statics.cpp23
1 files changed, 12 insertions, 11 deletions
diff --git a/engines/fullpipe/statics.cpp b/engines/fullpipe/statics.cpp
index b5baa180fa..5ea3b10d23 100644
--- a/engines/fullpipe/statics.cpp
+++ b/engines/fullpipe/statics.cpp
@@ -1579,9 +1579,6 @@ bool Movement::load(MfcArchive &file, StaticANIObject *ani) {
int dynCount = file.readUint16LE();
- debugC(6, kDebugXML, "%% <MOVEMENT id=%d name=\"%s\" x=%d y=%d priority=%d f8=%d>",
- _id, transCyrillic(_objectName), _ox, _oy, _priority, _field_8);
-
if (dynCount != 0xffff || _id == MV_MAN_TURN_LU) {
_framePosOffsets.resize(dynCount + 2);
@@ -1589,8 +1586,6 @@ bool Movement::load(MfcArchive &file, StaticANIObject *ani) {
DynamicPhase *ph = new DynamicPhase();
ph->load(file);
- debugC(6, kDebugXML, "%% <PHASE %s />", ph->toXML().c_str());
-
_dynamicPhases.push_back(ph);
_framePosOffsets[i].x = ph->_x;
@@ -1609,12 +1604,12 @@ bool Movement::load(MfcArchive &file, StaticANIObject *ani) {
_mx = file.readSint32LE();
_my = file.readSint32LE();
- staticsid = file.readUint16LE();
+ int staticsid2 = file.readUint16LE();
- _staticsObj2 = ani->getStaticsById(staticsid);
+ _staticsObj2 = ani->getStaticsById(staticsid2);
- if (!_staticsObj2 && (staticsid & 0x4000)) {
- Statics *s = ani->getStaticsById(staticsid ^ 0x4000);
+ if (!_staticsObj2 && (staticsid2 & 0x4000)) {
+ Statics *s = ani->getStaticsById(staticsid2 ^ 0x4000);
_staticsObj2 = ani->addReverseStatics(s);
}
@@ -1628,6 +1623,14 @@ bool Movement::load(MfcArchive &file, StaticANIObject *ani) {
_framePosOffsets[_dynamicPhases.size() - 1].y = _m2y;
}
+ debugC(6, kDebugXML, "%% <MOVEMENT id=%d name=\"%s\" x=%d y=%d priority=%d f8=%d staticsId=%d mX=%d my=%d staticsId2=%d m2x=%d m2y=%d>",
+ _id, transCyrillic(_objectName), _ox, _oy, _priority, _field_8, staticsid, _mx, _my, staticsid2, _m2x, _m2y);
+
+ for (int i = 0; i < dynCount; i++)
+ debugC(6, kDebugXML, "%% <PHASE %s />", _dynamicPhases[i]->toXML().c_str());
+
+ debugC(6, kDebugXML, "%% </MOVEMENT>");
+
} else {
int movid = file.readUint16LE();
@@ -1654,8 +1657,6 @@ bool Movement::load(MfcArchive &file, StaticANIObject *ani) {
_counter = 0;
updateCurrDynamicPhase();
- debugC(6, kDebugXML, "%% </MOVEMENT>");
-
return true;
}