diff options
| author | Yanis42 <35189056+Yanis42@users.noreply.github.com> | 2024-01-07 16:34:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-07 10:34:47 -0500 |
| commit | ab16e164220edda4de9d5146d6a81d94bbf37383 (patch) | |
| tree | a5d8df85b995cb314b9d737bce56b9cb1ca73ce5 /ZAPD/OtherStructs/CutsceneMM_Commands.cpp | |
| parent | 094e797349c86d0baef4a624962f4287aefdfef2 (diff) | |
Use Player Cue Ids enum (#306)
* implement player cue ids
* format
* Merge remote-tracking branch 'upstream/master' into player_cue_id
Diffstat (limited to 'ZAPD/OtherStructs/CutsceneMM_Commands.cpp')
| -rw-r--r-- | ZAPD/OtherStructs/CutsceneMM_Commands.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/ZAPD/OtherStructs/CutsceneMM_Commands.cpp b/ZAPD/OtherStructs/CutsceneMM_Commands.cpp index 85fce22..9e230f4 100644 --- a/ZAPD/OtherStructs/CutsceneMM_Commands.cpp +++ b/ZAPD/OtherStructs/CutsceneMM_Commands.cpp @@ -425,23 +425,24 @@ CutsceneMMSubCommandEntry_ActorCue::CutsceneMMSubCommandEntry_ActorCue( std::string CutsceneMMSubCommandEntry_ActorCue::GetBodySourceCode() const { - std::string result; + EnumData* enumData = &Globals::Instance->cfg.enumData; if (static_cast<CutsceneMM_CommandType>(commandID) == CutsceneMM_CommandType::CS_CMD_PLAYER_CUE) { - result = "CS_PLAYER_CUE"; + return StringHelper::Sprintf("CS_PLAYER_CUE(%s, %i, %i, 0x%04X, 0x%04X, 0x%04X, %i, %i, " + "%i, %i, %i, %i, %.8ef, %.8ef, %.8ef)", + enumData->playerCueId[base].c_str(), startFrame, endFrame, + rotX, rotY, rotZ, startPosX, startPosY, startPosZ, endPosX, + endPosY, endPosZ, normalX, normalY, normalZ); } else { - result = "CS_ACTOR_CUE"; + return StringHelper::Sprintf("CS_ACTOR_CUE(%i, %i, %i, 0x%04X, 0x%04X, 0x%04X, %i, %i, " + "%i, %i, %i, %i, %.8ef, %.8ef, %.8ef)", + base, startFrame, endFrame, rotX, rotY, rotZ, startPosX, + startPosY, startPosZ, endPosX, endPosY, endPosZ, normalX, + normalY, normalZ); } - - result += - StringHelper::Sprintf("(%i, %i, %i, 0x%04X, 0x%04X, 0x%04X, %i, %i, " - "%i, %i, %i, %i, %.8ef, %.8ef, %.8ef)", - base, startFrame, endFrame, rotX, rotY, rotZ, startPosX, startPosY, - startPosZ, endPosX, endPosY, endPosZ, normalX, normalY, normalZ); - return result; } size_t CutsceneMMSubCommandEntry_ActorCue::GetRawSize() const |