diff options
| author | Ethan Roseman <ethteck@gmail.com> | 2021-03-18 16:40:58 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-18 16:40:58 +0900 |
| commit | dc55bcdbc8b03318072edfe6c13d839b0c57638c (patch) | |
| tree | 273c99a7599c947f01d0753f822d56b567d7a495 /ZAPD/ZAnimation.cpp | |
| parent | 4d0d6cf32e194c03ad7755bc34a68f05cf189f6b (diff) | |
| parent | 5e95bed8fd98fe0967d4c6808199d681ec5079e5 (diff) | |
Merge branch 'master' into new-jenkins-agent
Diffstat (limited to 'ZAPD/ZAnimation.cpp')
| -rw-r--r-- | ZAPD/ZAnimation.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ZAPD/ZAnimation.cpp b/ZAPD/ZAnimation.cpp index 3a70f0e..21fdf3f 100644 --- a/ZAPD/ZAnimation.cpp +++ b/ZAPD/ZAnimation.cpp @@ -37,8 +37,6 @@ void ZAnimation::Save(const std::string& outFolder) void ZAnimation::ParseXML(tinyxml2::XMLElement* reader) { ZResource::ParseXML(reader); - - name = reader->Attribute("Name"); } string ZAnimation::GetSourceOutputCode(const std::string& prefix) @@ -46,6 +44,11 @@ string ZAnimation::GetSourceOutputCode(const std::string& prefix) return ""; } +ZResourceType ZAnimation::GetResourceType() +{ + return ZResourceType::Animation; +} + ZNormalAnimation::ZNormalAnimation() : ZAnimation() { rotationValues = vector<uint16_t>(); @@ -180,6 +183,6 @@ void ZLinkAnimation::ParseRawData() const uint8_t* data = rawData.data(); - //segmentAddress = SEG2FILESPACE(BitConverter::ToInt32BE(data, rawDataIndex + 4)); + //segmentAddress = GETSEGOFFSET(BitConverter::ToInt32BE(data, rawDataIndex + 4)); segmentAddress = (BitConverter::ToInt32BE(data, rawDataIndex + 4)); } |