From 4bf6600a3b67223d5e28d6a1fccfeb54e37d7a77 Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Sat, 13 Mar 2021 00:34:33 -0300 Subject: Add horses support (#89) * Factor common code as a function Signed-off-by: angie * Add some missing methods and change limbs from structs to classes Signed-off-by: angie * ZSkeleton::GetRawDataSize Signed-off-by: angie * add segAddress and fileAddress in ZLimbStandard Signed-off-by: angie * Move code to ZLimbStandard::GetSourceOutputCode Signed-off-by: angie * Move code to ZLimbLOD::GetSourceOutputCode and a few fixes Signed-off-by: angie * Add missing & and reestructure the code a bit. Signed-off-by: angie * Fix merge issues Signed-off-by: angie * Move stuff from FromRawData to constructors Signed-off-by: angie * Merge both Limb classes and refactor Signed-off-by: angie * Initial SkinLimb support Signed-off-by: angie * Extract SkinLimb type 11 dlist Signed-off-by: Angie * Extracting the first struct of SkinLimb Signed-off-by: Angie * Exporting the dlist of SkinLimb breaks stuff Signed-off-by: Angie * Add another struct of skinlimb Signed-off-by: Angie * Parse Struct_800A598C_2 Signed-off-by: Angie * Parse Struct_800A57C0 Signed-off-by: Angie * Extract sublimbs as array Signed-off-by: Angie * Export the full array of Struct_800A5E28 Signed-off-by: Angie * A few stylistic changes Signed-off-by: angie * a bit of cleanup Signed-off-by: angie * ZSkeleton::ParseXML Signed-off-by: angie * ZSkeleton::ParseRawData() Signed-off-by: Angie * Move the code around a bit Signed-off-by: Angie * Remove ZSkeletonType::Skin Signed-off-by: Angie * class Struct_800A57C0 Signed-off-by: Angie * class Struct_800A598C_2 Signed-off-by: Angie * class Struct_800A598C and class Struct_800A5E28 Signed-off-by: angie * MakeInternalDeclarations Signed-off-by: angie * Move limbs to ZLimb Signed-off-by: Angie * A bit of cleanup Signed-off-by: angie * Works, but something is wrong... Signed-off-by: angie * Final cleanup Signed-off-by: angie * I hope this is the final cleanup Signed-off-by: angie --- ZAPD/ZFile.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ZAPD/ZFile.cpp') diff --git a/ZAPD/ZFile.cpp b/ZAPD/ZFile.cpp index 220ba11..5046ed1 100644 --- a/ZAPD/ZFile.cpp +++ b/ZAPD/ZFile.cpp @@ -4,6 +4,7 @@ #include "ZRoom/ZRoom.h" #include "ZTexture.h" #include "ZAnimation.h" +#include "ZLimb.h" #include "ZSkeleton.h" #include "ZCollision.h" #include "ZScalar.h" @@ -237,10 +238,10 @@ void ZFile::ParseXML(ZFileMode mode, XMLElement* reader, std::string filename, b } else if (string(child->Name()) == "Limb") { - ZLimbStandard* limb = nullptr; + ZLimb* limb = nullptr; if (mode == ZFileMode::Extract) - limb = ZLimbStandard::FromXML(child, rawData, rawDataIndex, folderName, this); + limb = ZLimb::FromXML(child, rawData, rawDataIndex, folderName, this); resources.push_back(limb); -- cgit v1.2.3