[Scummvm-git-logs] scummvm master -> e3e9ba9d1f3151f992df334d6ae487b47d5f1306
elasota
noreply at scummvm.org
Fri Jul 22 23:41:59 UTC 2022
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
3eeed39f76 MTROPOLIS: Uninit fields cleanup
e3e9ba9d1f MTROPOLIS: Uninit fields cleanup
Commit: 3eeed39f766f4830fc56a3e8884cc12ed7ea67d8
https://github.com/scummvm/scummvm/commit/3eeed39f766f4830fc56a3e8884cc12ed7ea67d8
Author: elasota (ejlasota at gmail.com)
Date: 2022-07-22T19:24:35-04:00
Commit Message:
MTROPOLIS: Uninit fields cleanup
Changed paths:
engines/mtropolis/data.cpp
engines/mtropolis/data.h
diff --git a/engines/mtropolis/data.cpp b/engines/mtropolis/data.cpp
index 5b136683d9e..5ac2aa5110b 100644
--- a/engines/mtropolis/data.cpp
+++ b/engines/mtropolis/data.cpp
@@ -799,6 +799,11 @@ DataReadErrorCode GraphicElement::load(DataReader& reader) {
return kDataReadErrorNone;
}
+ImageElement::ImageElement()
+ : sizeIncludingTag(0), guid(0), lengthOfName(0), elementFlags(0), layer(0), sectionID(0),
+ rect1(Rect::createDefault()), rect2(Rect::createDefault()), imageAssetID(0), streamLocator(0), unknown7{0, 0, 0, 0} {
+}
+
DataReadErrorCode ImageElement::load(DataReader &reader) {
if (_revision != 2)
return kDataReadErrorUnsupportedRevision;
@@ -855,6 +860,11 @@ DataReadErrorCode TextLabelElement::load(DataReader &reader) {
return kDataReadErrorNone;
}
+SoundElement::SoundElement()
+ : sizeIncludingTag(0), guid(0), lengthOfName(0), elementFlags(0), soundFlags(0), unknown2(0),
+ unknown3{0, 0}, rightVolume(0), leftVolume(0), balance(0), assetID(0), unknown5{0, 0, 0, 0, 0, 0, 0, 0} {
+}
+
DataReadErrorCode SoundElement::load(DataReader& reader) {
if (_revision != 3)
return kDataReadErrorUnsupportedRevision;
@@ -869,6 +879,13 @@ DataReadErrorCode SoundElement::load(DataReader& reader) {
return kDataReadErrorNone;
}
+MovieElement::MovieElement()
+ : sizeIncludingTag(0), guid(0), lengthOfName(0), elementFlags(0), layer(0),
+ unknown3{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+ sectionID(0), unknown5{0, 0}, rect1(Rect::createDefault()), rect2(Rect::createDefault()), assetID(0), unknown7(0), volume(0), animationFlags(0),
+ unknown10{0, 0, 0, 0}, unknown11{0, 0, 0, 0}, streamLocator(0), unknown13{0, 0, 0, 0} {
+}
+
DataReadErrorCode MovieElement::load(DataReader &reader) {
if (_revision != 2)
return kDataReadErrorUnsupportedRevision;
@@ -885,6 +902,11 @@ DataReadErrorCode MovieElement::load(DataReader &reader) {
return kDataReadErrorNone;
}
+MToonElement::MToonElement()
+ : sizeIncludingTag(0), guid(0), lengthOfName(0), elementFlags(0), layer(0), animationFlags(0), unknown4{ 0, 0, 0, 0 },
+ sectionID(0), rect1(Rect::createDefault()), rect2(Rect::createDefault()), assetID(0), rateTimes100000(0), streamLocator(0), unknown6(0) {
+}
+
DataReadErrorCode MToonElement::load(DataReader &reader) {
if (_revision != 2 && _revision != 3)
return kDataReadErrorUnsupportedRevision;
@@ -900,6 +922,10 @@ DataReadErrorCode MToonElement::load(DataReader &reader) {
return kDataReadErrorNone;
}
+GlobalObjectInfo::GlobalObjectInfo()
+ : persistFlags(0), sizeIncludingTag(0), numGlobalModifiers(0), unknown1{0, 0, 0, 0} {
+}
+
DataReadErrorCode GlobalObjectInfo::load(DataReader &reader) {
if (_revision != 0)
return kDataReadErrorUnsupportedRevision;
@@ -911,8 +937,6 @@ DataReadErrorCode GlobalObjectInfo::load(DataReader &reader) {
return kDataReadErrorNone;
}
-
-
ProjectCatalog::ProjectCatalog() : persistFlags(0), sizeOfStreamAndSegmentDescs(0), unknown1(0), unknown2(0), unknown3(0) {
}
@@ -999,6 +1023,12 @@ DataReadErrorCode StreamHeader::load(DataReader& reader) {
return kDataReadErrorNone;
}
+BehaviorModifier::BehaviorModifier()
+ : modifierFlags(0), sizeIncludingTag(0), unknown2{0, 0}, guid(0), unknown4(0), unknown5(0), unknown6(0),
+ editorLayoutPosition(Point::createDefault()), lengthOfName(0), numChildren(0), behaviorFlags(0),
+ enableWhen(Event::createDefault()), disableWhen(Event::createDefault()), unknown7{0, 0} {
+}
+
DataReadErrorCode BehaviorModifier::load(DataReader& reader) {
if (_revision != 1)
return kDataReadErrorUnsupportedRevision;
@@ -1019,6 +1049,20 @@ DataReadErrorCode BehaviorModifier::load(DataReader& reader) {
return kDataReadErrorNone;
}
+MiniscriptProgram::LocalRef::LocalRef()
+ : guid(0), lengthOfName(0), unknown2(0) {
+}
+
+
+MiniscriptProgram::Attribute::Attribute()
+ : lengthOfName(0), unknown3(0) {
+}
+
+MiniscriptProgram::MiniscriptProgram()
+ : unknown1(0), sizeOfInstructions(0), numOfInstructions(0), numLocalRefs(0), numAttributes(0),
+ projectFormat(kProjectFormatUnknown), isBigEndian(false) {
+}
+
bool MiniscriptProgram::load(DataReader &reader) {
projectFormat = reader.getProjectFormat();
isBigEndian = reader.isBigEndian();
@@ -1059,6 +1103,10 @@ bool MiniscriptProgram::load(DataReader &reader) {
return true;
}
+TypicalModifierHeader::TypicalModifierHeader()
+ : modifierFlags(0), sizeIncludingTag(0), guid(0), unknown3{0, 0, 0, 0, 0, 0}, unknown4(0), editorLayoutPosition(Point::createDefault()), lengthOfName(0) {
+}
+
bool TypicalModifierHeader::load(DataReader& reader) {
if (!reader.readU32(modifierFlags) || !reader.readU32(sizeIncludingTag) || !reader.readU32(guid)
|| !reader.readBytes(unknown3) || !reader.readU32(unknown4) || !editorLayoutPosition.load(reader)
diff --git a/engines/mtropolis/data.h b/engines/mtropolis/data.h
index b5f27eeb044..dd10c1b924c 100644
--- a/engines/mtropolis/data.h
+++ b/engines/mtropolis/data.h
@@ -623,6 +623,8 @@ protected:
};
struct ImageElement : public StructuralDef {
+ ImageElement();
+
// Possible element flags: NotDirectToScreen, CacheBitmap, Hidden
uint32 sizeIncludingTag;
uint32 guid;
@@ -684,6 +686,8 @@ struct SoundElement : public StructuralDef {
kLoop = 0x80000000,
};
+ SoundElement();
+
// Possible element flags: Loop, Paused
uint32 sizeIncludingTag;
uint32 guid;
@@ -705,6 +709,8 @@ protected:
};
struct MovieElement : public StructuralDef {
+ MovieElement();
+
// Possible flags: NotDirectToScreen, CacheBitmap, Hidden, Loop, Loop + Alternate, Paused
uint32 sizeIncludingTag;
uint32 guid;
@@ -732,6 +738,8 @@ protected:
};
struct MToonElement : public StructuralDef {
+ MToonElement();
+
// Possible flags: NotDirectToScreen, CacheBitmap, Hidden, Loop, Paused, PlayEveryFrame (inverted as "Maintain Rate")
uint32 sizeIncludingTag;
uint32 guid;
@@ -755,16 +763,18 @@ protected:
};
struct GlobalObjectInfo : public DataObject {
- DataReadErrorCode load(DataReader &reader) override;
+ GlobalObjectInfo();
uint32 persistFlags;
uint32 sizeIncludingTag;
uint16 numGlobalModifiers;
uint8 unknown1[4];
+
+protected:
+ DataReadErrorCode load(DataReader &reader) override;
};
class ProjectCatalog : public DataObject {
-
public:
struct StreamDesc {
char streamType[25];
@@ -813,6 +823,8 @@ struct BehaviorModifier : public DataObject {
kBehaviorFlagSwitchable = 1,
};
+ BehaviorModifier();
+
uint32 modifierFlags;
uint32 sizeIncludingTag;
uint8 unknown2[2];
@@ -836,6 +848,8 @@ protected:
struct MiniscriptProgram {
struct LocalRef {
+ LocalRef();
+
uint32 guid;
uint8 lengthOfName;
uint8 unknown2;
@@ -844,12 +858,16 @@ struct MiniscriptProgram {
};
struct Attribute {
+ Attribute();
+
uint8 lengthOfName;
uint8 unknown3;
Common::String name;
};
+ MiniscriptProgram();
+
uint32 unknown1;
uint32 sizeOfInstructions;
uint32 numOfInstructions;
@@ -868,6 +886,8 @@ struct MiniscriptProgram {
// Header used for most modifiers, but not all
struct TypicalModifierHeader {
+ TypicalModifierHeader();
+
uint32 modifierFlags;
uint32 sizeIncludingTag;
uint32 guid;
Commit: e3e9ba9d1f3151f992df334d6ae487b47d5f1306
https://github.com/scummvm/scummvm/commit/e3e9ba9d1f3151f992df334d6ae487b47d5f1306
Author: elasota (ejlasota at gmail.com)
Date: 2022-07-22T19:41:27-04:00
Commit Message:
MTROPOLIS: Uninit fields cleanup
Changed paths:
engines/mtropolis/data.cpp
engines/mtropolis/data.h
diff --git a/engines/mtropolis/data.cpp b/engines/mtropolis/data.cpp
index 5ac2aa5110b..2bb8b241568 100644
--- a/engines/mtropolis/data.cpp
+++ b/engines/mtropolis/data.cpp
@@ -420,6 +420,10 @@ bool Label::load(DataReader &reader) {
return reader.readU32(superGroupID) && reader.readU32(labelID);
}
+InternalTypeTaggedValue::InternalTypeTaggedValue() : type(0) {
+ memset(&this->value, 0, sizeof(this->value));
+}
+
bool InternalTypeTaggedValue::load(DataReader &reader) {
if (!reader.readU16(type))
return false;
@@ -818,6 +822,12 @@ DataReadErrorCode ImageElement::load(DataReader &reader) {
return kDataReadErrorNone;
}
+TextLabelElement::TextLabelElement()
+ : sizeIncludingTag(0), guid(0), lengthOfName(0), elementFlags(0), layer(0), sectionID(0),
+ rect1(Rect::createDefault()), rect2(Rect::createDefault()), assetID(0), haveMacPart(false), haveWinPart(false) {
+ memset(&this->platform, 0, sizeof(this->platform));
+}
+
DataReadErrorCode TextLabelElement::load(DataReader &reader) {
if (reader.getProjectFormat() == kProjectFormatMacintosh) {
if (_revision != 2)
@@ -1119,6 +1129,10 @@ bool TypicalModifierHeader::load(DataReader& reader) {
return true;
}
+MiniscriptModifier::MiniscriptModifier()
+ : enableWhen(Event::createDefault()), unknown6{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, unknown7(0) {
+}
+
DataReadErrorCode MiniscriptModifier::load(DataReader &reader) {
if (_revision != 1003)
return kDataReadErrorUnsupportedRevision;
@@ -1129,6 +1143,11 @@ DataReadErrorCode MiniscriptModifier::load(DataReader &reader) {
return kDataReadErrorNone;
}
+SaveAndRestoreModifier::SaveAndRestoreModifier()
+ : unknown1{0, 0, 0, 0}, saveWhen(Event::createDefault()), restoreWhen(Event::createDefault()),
+ unknown5{0, 0, 0, 0, 0, 0, 0, 0}, lengthOfFilePath(0), lengthOfFileName(0), lengthOfVariableName(0), lengthOfVariableString(0) {
+}
+
DataReadErrorCode SaveAndRestoreModifier::load(DataReader &reader) {
if (_revision != 1001)
return kDataReadErrorUnsupportedRevision;
@@ -1143,6 +1162,11 @@ DataReadErrorCode SaveAndRestoreModifier::load(DataReader &reader) {
return kDataReadErrorNone;
}
+MessengerModifier::MessengerModifier()
+ : messageFlags(0), send(Event::createDefault()), when(Event::createDefault()), unknown14(0), destination(0),
+ unknown11{0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, withSourceLength(0), withStringLength(0) {
+}
+
DataReadErrorCode MessengerModifier::load(DataReader &reader) {
if (_revision != 1002)
return kDataReadErrorUnsupportedRevision;
@@ -1161,6 +1185,11 @@ DataReadErrorCode MessengerModifier::load(DataReader &reader) {
return kDataReadErrorNone;
}
+SetModifier::SetModifier()
+ : unknown1{0, 0, 0, 0}, executeWhen(Event::createDefault()), unknown3(0),
+ sourceNameLength(0), targetNameLength(0), sourceStringLength(0), targetStringLength(0), unknown4(0) {
+}
+
DataReadErrorCode SetModifier::load(DataReader &reader) {
if (_revision != 1000)
return kDataReadErrorUnsupportedRevision;
@@ -1177,6 +1206,10 @@ DataReadErrorCode SetModifier::load(DataReader &reader) {
return kDataReadErrorNone;
}
+AliasModifier::AliasModifier()
+ : modifierFlags(0), sizeIncludingTag(0), aliasIndexPlusOne(0), unknown1(0), unknown2(0), lengthOfName(0), guid(0), editorLayoutPosition(Point::createDefault()) {
+}
+
DataReadErrorCode AliasModifier::load(DataReader& reader) {
if (_revision != 2)
return kDataReadErrorUnsupportedRevision;
@@ -1195,6 +1228,10 @@ DataReadErrorCode AliasModifier::load(DataReader& reader) {
return kDataReadErrorNone;
}
+ChangeSceneModifier::ChangeSceneModifier()
+ : executeWhen(Event::createDefault()), targetSectionGUID(0), targetSubsectionGUID(0), targetSceneGUID(0) {
+}
+
DataReadErrorCode ChangeSceneModifier::load(DataReader &reader) {
if (_revision != 1001)
return kDataReadErrorUnsupportedRevision;
@@ -1206,6 +1243,11 @@ DataReadErrorCode ChangeSceneModifier::load(DataReader &reader) {
return kDataReadErrorNone;
}
+SoundEffectModifier::SoundEffectModifier()
+ : unknown1{0, 0, 0, 0}, executeWhen(Event::createDefault()), terminateWhen(Event::createDefault()),
+ unknown2(0), unknown3{0, 0, 0, 0}, assetID(0), unknown5{0, 0, 0, 0} {
+}
+
DataReadErrorCode SoundEffectModifier::load(DataReader &reader) {
if (_revision != 1000)
return kDataReadErrorUnsupportedRevision;
diff --git a/engines/mtropolis/data.h b/engines/mtropolis/data.h
index dd10c1b924c..bad8a0a873e 100644
--- a/engines/mtropolis/data.h
+++ b/engines/mtropolis/data.h
@@ -319,6 +319,8 @@ struct InternalTypeTaggedValue {
Point asPoint;
};
+ InternalTypeTaggedValue();
+
uint16 type;
ValueUnion value;
@@ -645,6 +647,8 @@ protected:
};
struct TextLabelElement : public StructuralDef {
+ TextLabelElement();
+
// Possible element flags: NotDirectToScreen, CacheBitmap, Hidden
uint32 sizeIncludingTag;
uint32 guid;
@@ -902,6 +906,8 @@ struct TypicalModifierHeader {
};
struct MiniscriptModifier : public DataObject {
+ MiniscriptModifier();
+
TypicalModifierHeader modHeader;
Event enableWhen;
uint8 unknown6[11];
@@ -915,6 +921,8 @@ protected:
struct SaveAndRestoreModifier : public DataObject {
+ SaveAndRestoreModifier();
+
TypicalModifierHeader modHeader;
uint8 unknown1[4];
Event saveWhen;
@@ -945,6 +953,8 @@ enum MessageFlags {
struct MessengerModifier : public DataObject {
+ MessengerModifier();
+
TypicalModifierHeader modHeader;
uint32 messageFlags;
@@ -965,6 +975,8 @@ protected:
};
struct SetModifier : public DataObject {
+ SetModifier();
+
TypicalModifierHeader modHeader;
uint8 unknown1[4];
@@ -988,6 +1000,8 @@ protected:
};
struct AliasModifier : public DataObject {
+ AliasModifier();
+
uint32 modifierFlags;
uint32 sizeIncludingTag;
uint16 aliasIndexPlusOne;
@@ -1013,6 +1027,8 @@ struct ChangeSceneModifier : public DataObject {
kChangeSceneFlagWrapAround = 0x04000000,
};
+ ChangeSceneModifier();
+
TypicalModifierHeader modHeader;
uint32 changeSceneFlags;
Event executeWhen;
@@ -1025,6 +1041,8 @@ protected:
};
struct SoundEffectModifier : public DataObject {
+ SoundEffectModifier();
+
static const uint32 kSpecialAssetIDSystemBeep = 0xffffffffu;
TypicalModifierHeader modHeader;
More information about the Scummvm-git-logs
mailing list