diff options
| author | Yanis42 <35189056+Yanis42@users.noreply.github.com> | 2023-10-17 05:56:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-16 23:56:49 -0400 |
| commit | 094e797349c86d0baef4a624962f4287aefdfef2 (patch) | |
| tree | ee08bc4d0cba7fe53732d056627532bb2ffd605d /ZAPD/GameConfig.cpp | |
| parent | 338e35f89afc905399ad90c952d154ae7b20bf75 (diff) | |
Update old names to newer ones (#305)JackMaster
* JointKey -> LegacyJointKey
* CamData -> BgCamInfo
* TransformData -> CurveInterpKnot
* TransformUpdateIndex -> CurveAnimationHeader
* SkelCurveLimbList -> CurveSkeletonHeader
* LightSettings -> EnvLightSettings
* EntranceEntry -> Spawn
* PolygonDlist -> RoomShapeDListsEntry
* PolygonType0 -> RoomShapeNormal,
MeshHeader1Single -> RoomShapeImageSingle
* BgImage -> RoomShapeImageMultiBgEntry
* MeshHeader1Multi -> RoomShapeImageMulti
PolygonDlist2 -> RoomShapeCullableEntry
* PolygonType2 -> RoomShapeCullable
* SCENE_CMD_MESH -> SCENE_CMD_ROOM_SHAPE
* implement enum parsing + use NaviQuestHintFileId
* Struct_800A57C0 -> SkinVertex
* Struct_800A598C_2 -> SkinTransformation
* Struct_800A5E28 -> SkinAnimatedLimbData
* Struct_800A598C -> SkinLimbModif
* fix MM issues
* LinkAnimationHeader -> PlayerAnimationHeader (MM)
* CsCameraEntry -> ActorCsCamInfo (MM)
* remaining scene commands (MM)
* format
* removed useless comment
* name skinlimb members
* format
* fixed indentation
Diffstat (limited to 'ZAPD/GameConfig.cpp')
| -rw-r--r-- | ZAPD/GameConfig.cpp | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/ZAPD/GameConfig.cpp b/ZAPD/GameConfig.cpp index fffa7f4..a6e3bdb 100644 --- a/ZAPD/GameConfig.cpp +++ b/ZAPD/GameConfig.cpp @@ -174,7 +174,7 @@ void GameConfig::ConfigFunc_EnumData(const tinyxml2::XMLElement& element) if (eResult != tinyxml2::XML_SUCCESS) { - throw std::runtime_error("Error: Unable to read cutscene data."); + throw std::runtime_error("Error: Unable to read enum data."); } tinyxml2::XMLNode* root = doc.FirstChild(); @@ -194,47 +194,50 @@ void GameConfig::ConfigFunc_EnumData(const tinyxml2::XMLElement& element) // Common if (enumKey == "cmd") - cutsceneData.cutsceneCmd[itemIndex] = itemID; + enumData.cutsceneCmd[itemIndex] = itemID; else if (enumKey == "miscType") - cutsceneData.miscType[itemIndex] = itemID; + enumData.miscType[itemIndex] = itemID; else if (enumKey == "textType") - cutsceneData.textType[itemIndex] = itemID; + enumData.textType[itemIndex] = itemID; else if (enumKey == "fadeOutSeqPlayer") - cutsceneData.fadeOutSeqPlayer[itemIndex] = itemID; + enumData.fadeOutSeqPlayer[itemIndex] = itemID; else if (enumKey == "transitionType") - cutsceneData.transitionType[itemIndex] = itemID; + enumData.transitionType[itemIndex] = itemID; else if (enumKey == "destination") - cutsceneData.destination[itemIndex] = itemID; + enumData.destination[itemIndex] = itemID; + + else if (enumKey == "naviQuestHintType") + enumData.naviQuestHintType[itemIndex] = itemID; // MM else if (enumKey == "modifySeqType") - cutsceneData.modifySeqType[itemIndex] = itemID; + enumData.modifySeqType[itemIndex] = itemID; else if (enumKey == "chooseCreditsSceneType") - cutsceneData.chooseCreditsSceneType[itemIndex] = itemID; + enumData.chooseCreditsSceneType[itemIndex] = itemID; else if (enumKey == "destinationType") - cutsceneData.destinationType[itemIndex] = itemID; + enumData.destinationType[itemIndex] = itemID; else if (enumKey == "motionBlurType") - cutsceneData.motionBlurType[itemIndex] = itemID; + enumData.motionBlurType[itemIndex] = itemID; else if (enumKey == "transitionGeneralType") - cutsceneData.transitionGeneralType[itemIndex] = itemID; + enumData.transitionGeneralType[itemIndex] = itemID; else if (enumKey == "rumbleType") - cutsceneData.rumbleType[itemIndex] = itemID; + enumData.rumbleType[itemIndex] = itemID; else if (enumKey == "spawnFlag") - cutsceneData.spawnFlag[itemIndex] = itemID; + enumData.spawnFlag[itemIndex] = itemID; else if (enumKey == "endSfx") - cutsceneData.endSfx[itemIndex] = itemID; + enumData.endSfx[itemIndex] = itemID; } } } |