From 260dbaca7d50784ad5ee48a8dd0d98a1a507b4ab Mon Sep 17 00:00:00 2001 From: Lioncash Date: Tue, 31 Mar 2020 01:25:57 -0400 Subject: [PATCH] CAnimData: Rename IceModel() to GetIceModel() Allows const overloading to work and prevents compilation errors from occuring if the const qualifier on an instance changes over refactoring. --- Runtime/Character/CAnimData.hpp | 2 +- Runtime/World/CPatterned.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Runtime/Character/CAnimData.hpp b/Runtime/Character/CAnimData.hpp index 1bfe21217..2ea18709b 100644 --- a/Runtime/Character/CAnimData.hpp +++ b/Runtime/Character/CAnimData.hpp @@ -251,7 +251,7 @@ public: s32 GetCharacterIndex() const { return x204_charIdx; } u16 GetDefaultAnimation() const { return x208_defaultAnim; } - TLockedToken& IceModel() { return xe4_iceModelData; } + TLockedToken& GetIceModel() { return xe4_iceModelData; } const TLockedToken& GetIceModel() const { return xe4_iceModelData; } void SetParticleLightIdx(s32 idx) { x21c_particleLightIdx = idx; } diff --git a/Runtime/World/CPatterned.cpp b/Runtime/World/CPatterned.cpp index 100fc1b27..3bfbbb3ee 100644 --- a/Runtime/World/CPatterned.cpp +++ b/Runtime/World/CPatterned.cpp @@ -1586,7 +1586,7 @@ void CPatterned::RenderIceModelWithFlags(const CModelFlags& flags) const { CModelFlags useFlags = flags; useFlags.x1_matSetIdx = 0; CAnimData* animData = x64_modelData->GetAnimationData(); - if (CMorphableSkinnedModel* iceModel = animData->IceModel().GetObj()) + if (CMorphableSkinnedModel* iceModel = animData->GetIceModel().GetObj()) animData->Render(*iceModel, useFlags, {*x510_vertexMorph}, iceModel->GetMorphMagnitudes()); }