summaryrefslogtreecommitdiff
path: root/ZAPD/OtherStructs/CutsceneMM_Commands.cpp
diff options
context:
space:
mode:
authorYanis42 <35189056+Yanis42@users.noreply.github.com>2023-10-17 05:56:49 +0200
committerGitHub <noreply@github.com>2023-10-16 23:56:49 -0400
commit094e797349c86d0baef4a624962f4287aefdfef2 (patch)
treeee08bc4d0cba7fe53732d056627532bb2ffd605d /ZAPD/OtherStructs/CutsceneMM_Commands.cpp
parent338e35f89afc905399ad90c952d154ae7b20bf75 (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/OtherStructs/CutsceneMM_Commands.cpp')
-rw-r--r--ZAPD/OtherStructs/CutsceneMM_Commands.cpp51
1 files changed, 25 insertions, 26 deletions
diff --git a/ZAPD/OtherStructs/CutsceneMM_Commands.cpp b/ZAPD/OtherStructs/CutsceneMM_Commands.cpp
index f0bd68a..85fce22 100644
--- a/ZAPD/OtherStructs/CutsceneMM_Commands.cpp
+++ b/ZAPD/OtherStructs/CutsceneMM_Commands.cpp
@@ -37,7 +37,7 @@ CutsceneMMSubCommandEntry_GenericCmd::CutsceneMMSubCommandEntry_GenericCmd(
std::string CutsceneMMSubCommandEntry_GenericCmd::GetBodySourceCode() const
{
- CutsceneEnumData* cutsceneData = &Globals::Instance->cfg.cutsceneData;
+ EnumData* enumData = &Globals::Instance->cfg.enumData;
const auto& element = csCommandsDescMM.find(commandId);
std::string entryFmt = "CS_UNK_DATA(0x%02X, %i, %i, %i)";
std::string type = "";
@@ -49,29 +49,28 @@ std::string CutsceneMMSubCommandEntry_GenericCmd::GetBodySourceCode() const
}
if (commandId == CutsceneMM_CommandType::CS_CMD_MISC &&
- cutsceneData->miscType.find(base) != cutsceneData->miscType.end())
- type = cutsceneData->miscType[base];
+ enumData->miscType.find(base) != enumData->miscType.end())
+ type = enumData->miscType[base];
else if (commandId == CutsceneMM_CommandType::CS_CMD_TRANSITION &&
- cutsceneData->transitionType.find(base) != cutsceneData->transitionType.end())
- type = cutsceneData->transitionType[base];
+ enumData->transitionType.find(base) != enumData->transitionType.end())
+ type = enumData->transitionType[base];
else if (commandId == CutsceneMM_CommandType::CS_CMD_MOTION_BLUR &&
- cutsceneData->motionBlurType.find(base) != cutsceneData->motionBlurType.end())
- type = cutsceneData->motionBlurType[base];
+ enumData->motionBlurType.find(base) != enumData->motionBlurType.end())
+ type = enumData->motionBlurType[base];
else if (commandId == CutsceneMM_CommandType::CS_CMD_MODIFY_SEQ &&
- cutsceneData->modifySeqType.find(base) != cutsceneData->modifySeqType.end())
- type = cutsceneData->modifySeqType[base];
+ enumData->modifySeqType.find(base) != enumData->modifySeqType.end())
+ type = enumData->modifySeqType[base];
else if (commandId == CutsceneMM_CommandType::CS_CMD_DESTINATION &&
- cutsceneData->destinationType.find(base) != cutsceneData->destinationType.end())
- type = cutsceneData->destinationType[base];
+ enumData->destinationType.find(base) != enumData->destinationType.end())
+ type = enumData->destinationType[base];
else if (commandId == CutsceneMM_CommandType::CS_CMD_CHOOSE_CREDITS_SCENES &&
- cutsceneData->chooseCreditsSceneType.find(base) !=
- cutsceneData->chooseCreditsSceneType.end())
- type = cutsceneData->chooseCreditsSceneType[base];
+ enumData->chooseCreditsSceneType.find(base) != enumData->chooseCreditsSceneType.end())
+ type = enumData->chooseCreditsSceneType[base];
else if (commandId == CutsceneMM_CommandType::CS_CMD_GIVE_TATL)
type = base ? "true" : "false";
@@ -173,11 +172,11 @@ CutsceneSubCommandEntry_TransitionGeneral::CutsceneSubCommandEntry_TransitionGen
std::string CutsceneSubCommandEntry_TransitionGeneral::GetBodySourceCode() const
{
- CutsceneEnumData* cutsceneData = &Globals::Instance->cfg.cutsceneData;
+ EnumData* enumData = &Globals::Instance->cfg.enumData;
- if (cutsceneData->transitionGeneralType.find(base) != cutsceneData->transitionGeneralType.end())
+ if (enumData->transitionGeneralType.find(base) != enumData->transitionGeneralType.end())
return StringHelper::Sprintf("CS_TRANSITION_GENERAL(%s, %i, %i, %i, %i, %i)",
- cutsceneData->transitionGeneralType[base].c_str(), startFrame,
+ enumData->transitionGeneralType[base].c_str(), startFrame,
endFrame, unk_06, unk_07, unk_08);
return StringHelper::Sprintf("CS_TRANSITION_GENERAL(0x%02X, %i, %i, %i, %i, %i)", base,
@@ -220,11 +219,11 @@ CutsceneSubCommandEntry_FadeOutSeq::CutsceneSubCommandEntry_FadeOutSeq(
std::string CutsceneSubCommandEntry_FadeOutSeq::GetBodySourceCode() const
{
- CutsceneEnumData* cutsceneData = &Globals::Instance->cfg.cutsceneData;
+ EnumData* enumData = &Globals::Instance->cfg.enumData;
- if (cutsceneData->fadeOutSeqPlayer.find(base) != cutsceneData->fadeOutSeqPlayer.end())
+ if (enumData->fadeOutSeqPlayer.find(base) != enumData->fadeOutSeqPlayer.end())
return StringHelper::Sprintf("CS_FADE_OUT_SEQ(%s, %i, %i)",
- cutsceneData->fadeOutSeqPlayer[base].c_str(), startFrame,
+ enumData->fadeOutSeqPlayer[base].c_str(), startFrame,
endFrame);
return StringHelper::Sprintf("CS_FADE_OUT_SEQ(%i, %i, %i)", base, startFrame, endFrame);
@@ -291,11 +290,11 @@ CutsceneMMSubCommandEntry_Rumble::CutsceneMMSubCommandEntry_Rumble(
std::string CutsceneMMSubCommandEntry_Rumble::GetBodySourceCode() const
{
- CutsceneEnumData* cutsceneData = &Globals::Instance->cfg.cutsceneData;
+ EnumData* enumData = &Globals::Instance->cfg.enumData;
- if (cutsceneData->rumbleType.find(base) != cutsceneData->rumbleType.end())
+ if (enumData->rumbleType.find(base) != enumData->rumbleType.end())
return StringHelper::Sprintf("CS_RUMBLE(%s, %i, %i, 0x%02X, 0x%02X, 0x%02X)",
- cutsceneData->rumbleType[base].c_str(), startFrame, endFrame,
+ enumData->rumbleType[base].c_str(), startFrame, endFrame,
intensity, decayTimer, decayStep);
return StringHelper::Sprintf("CS_RUMBLE(0x%04X, %i, %i, 0x%02X, 0x%02X, 0x%02X)", base,
@@ -467,17 +466,17 @@ CutsceneMMCommand_ActorCue::CutsceneMMCommand_ActorCue(const std::vector<uint8_t
std::string CutsceneMMCommand_ActorCue::GetCommandMacro() const
{
- CutsceneEnumData* cutsceneData = &Globals::Instance->cfg.cutsceneData;
+ EnumData* enumData = &Globals::Instance->cfg.enumData;
if (static_cast<CutsceneMM_CommandType>(commandID) == CutsceneMM_CommandType::CS_CMD_PLAYER_CUE)
{
return StringHelper::Sprintf("CS_PLAYER_CUE_LIST(%i)", numEntries);
}
- if (cutsceneData->cutsceneCmd.find(commandID) != cutsceneData->cutsceneCmd.end())
+ if (enumData->cutsceneCmd.find(commandID) != enumData->cutsceneCmd.end())
{
return StringHelper::Sprintf("CS_ACTOR_CUE_LIST(%s, %i)",
- cutsceneData->cutsceneCmd[commandID].c_str(), numEntries);
+ enumData->cutsceneCmd[commandID].c_str(), numEntries);
}
return StringHelper::Sprintf("CS_ACTOR_CUE_LIST(0x%03X, %i)", commandID, numEntries);
}