diff options
| -rw-r--r-- | engines/fullpipe/stateloader.cpp | 7 | ||||
| -rw-r--r-- | engines/fullpipe/utils.cpp | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/fullpipe/stateloader.cpp b/engines/fullpipe/stateloader.cpp index 64604a29e9..4189183860 100644 --- a/engines/fullpipe/stateloader.cpp +++ b/engines/fullpipe/stateloader.cpp @@ -449,20 +449,19 @@ CGameVar::CGameVar() { bool CGameVar::load(MfcArchive &file) { _stringObj = file.readPascalString(); _varType = file.readUint32LE(); - debug(0, "CGameVar: %d", _varType); switch (_varType) { case 0: _value.intValue = file.readUint32LE(); - debug(0, "--> %d", _value.intValue); + debug(0, "d --> %d", _value.intValue); break; case 1: _value.intValue = file.readUint32LE(); // FIXME - debug(0, "--> %f", _value.floatValue); + debug(0, "f --> %f", _value.floatValue); break; case 2: _value.stringValue = file.readPascalString(); - debug(0, "--> %s", _value.stringValue); + debug(0, "s --> %s", _value.stringValue); break; default: error("Unknown var type"); diff --git a/engines/fullpipe/utils.cpp b/engines/fullpipe/utils.cpp index aa4c270d54..a81665b48b 100644 --- a/engines/fullpipe/utils.cpp +++ b/engines/fullpipe/utils.cpp @@ -127,7 +127,7 @@ CObject *MfcArchive::parseClass() { objectId = _classMap[name]; _objectMap.push_back(objectId); - debug(0, "tag: %d (%x)", _objectMap.size() - 1, objectId); + debug(0, "tag: %d 0x%x (%x)", _objectMap.size() - 1, _objectMap.size() - 1, objectId); objectId = _classMap[name]; } else if ((obTag & 0x8000) == 0) { @@ -145,7 +145,8 @@ CObject *MfcArchive::parseClass() { objectId = _objectMap[obTag]; } - _objectMap.push_back(objectId); + if (objectId) + _objectMap.push_back(objectId); debug(0, "objectId: %d", objectId); |