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/ZRoom/Commands/SetLightingSettings.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/ZRoom/Commands/SetLightingSettings.cpp')
| -rw-r--r-- | ZAPD/ZRoom/Commands/SetLightingSettings.cpp | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/ZAPD/ZRoom/Commands/SetLightingSettings.cpp b/ZAPD/ZRoom/Commands/SetLightingSettings.cpp index ba5785c..eaf01cd 100644 --- a/ZAPD/ZRoom/Commands/SetLightingSettings.cpp +++ b/ZAPD/ZRoom/Commands/SetLightingSettings.cpp @@ -34,18 +34,28 @@ void SetLightingSettings::DeclareReferences(const std::string& prefix) declaration += "\n"; } - parent->AddDeclarationArray( - segmentOffset, DeclarationAlignment::Align4, - settings.size() * settings.front().GetRawDataSize(), "LightSettings", - StringHelper::Sprintf("%sLightSettings0x%06X", prefix.c_str(), segmentOffset), - settings.size(), declaration); + if (Globals::Instance->game != ZGame::MM_RETAIL) + parent->AddDeclarationArray( + segmentOffset, DeclarationAlignment::Align4, + settings.size() * settings.front().GetRawDataSize(), "EnvLightSettings", + StringHelper::Sprintf("%sLightSettings0x%06X", prefix.c_str(), segmentOffset), + settings.size(), declaration); + else + parent->AddDeclarationArray( + segmentOffset, DeclarationAlignment::Align4, + settings.size() * settings.front().GetRawDataSize(), "LightSettings", + StringHelper::Sprintf("%sLightSettings0x%06X", prefix.c_str(), segmentOffset), + settings.size(), declaration); } } std::string SetLightingSettings::GetBodySourceCode() const { std::string listName; - Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "LightSettings", listName); + if (Globals::Instance->game != ZGame::MM_RETAIL) + Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "EnvLightSettings", listName); + else + Globals::Instance->GetSegmentedPtrName(cmdArg2, parent, "LightSettings", listName); return StringHelper::Sprintf("SCENE_CMD_ENV_LIGHT_SETTINGS(%i, %s)", settings.size(), listName.c_str()); } |