From 094e797349c86d0baef4a624962f4287aefdfef2 Mon Sep 17 00:00:00 2001 From: Yanis42 <35189056+Yanis42@users.noreply.github.com> Date: Tue, 17 Oct 2023 05:56:49 +0200 Subject: Update old names to newer ones (#305) * 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 --- ZAPD/ZRoom/Commands/SetCutsceneEntryList.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ZAPD/ZRoom/Commands/SetCutsceneEntryList.cpp') diff --git a/ZAPD/ZRoom/Commands/SetCutsceneEntryList.cpp b/ZAPD/ZRoom/Commands/SetCutsceneEntryList.cpp index e747d91..96c50c3 100644 --- a/ZAPD/ZRoom/Commands/SetCutsceneEntryList.cpp +++ b/ZAPD/ZRoom/Commands/SetCutsceneEntryList.cpp @@ -84,13 +84,13 @@ CutsceneEntry::CutsceneEntry(const std::vector& rawData, uint32_t rawDa std::string CutsceneEntry::GetBodySourceCode() const { - CutsceneEnumData* cutsceneData = &Globals::Instance->cfg.cutsceneData; + EnumData* enumData = &Globals::Instance->cfg.enumData; - if (cutsceneData->endSfx.find(endSfx) != cutsceneData->endSfx.end()) + if (enumData->endSfx.find(endSfx) != enumData->endSfx.end()) return StringHelper::Sprintf("%i, %i, %i, %i, %i, %s, %i, %i, %i, %i", priority, length, csCamId, scriptIndex, additionalCsId, - cutsceneData->endSfx[endSfx].c_str(), customValue, - hudVisibility, endCam, letterboxSize); + enumData->endSfx[endSfx].c_str(), customValue, hudVisibility, + endCam, letterboxSize); else return StringHelper::Sprintf("%i, %i, %i, %i, %i, %i, %i, %i, %i, %i", priority, length, csCamId, scriptIndex, additionalCsId, endSfx, customValue, -- cgit v1.2.3