AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-09 00:27:42 +00:00
Code Issues Projects Releases Wiki Activity

CScriptPlayerActor: Remove two usages of const_cast

Browse Source 
While we're at it, we can also simplify the implementation of
GetPostConstructed().
This commit is contained in:
Lioncash
2020-04-09 20:05:31 -04:00
parent c796cf5315
commit a2f7527388
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Runtime/World/CScriptPlayerActor.cpp
View File

@@ -211,8 +211,8 @@ void CScriptPlayerActor::Think(float dt, CStateManager& mgr) {
if (x354_29_loading && !x354_28_suitModelLoading && !x354_27_beamModelLoading && x64_modelData &&
!x64_modelData->IsNull() && x64_modelData->IsLoaded(0)) {
if (x355_24_areaTrackingLoad) {
const CGameArea* area = mgr.GetWorld()->GetAreaAlways(x4_areaId);
--const_cast<CGameArea::CPostConstructed*>(area->GetPostConstructed())->x113c_playerActorsLoading;
CGameArea* area = mgr.GetWorld()->GetArea(x4_areaId);
--area->GetPostConstructed()->x113c_playerActorsLoading;
x355_24_areaTrackingLoad = false;
}
x354_29_loading = false;
@@ -285,8 +285,8 @@ void CScriptPlayerActor::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid
case EScriptObjectMessage::InitializedInArea:
x354_31_deferOnlineLoad = true;
if (x350_flags & 0x8) {
const CGameArea* area = mgr.GetWorld()->GetAreaAlways(x4_areaId);
++const_cast<CGameArea::CPostConstructed*>(area->GetPostConstructed())->x113c_playerActorsLoading;
CGameArea* area = mgr.GetWorld()->GetArea(x4_areaId);
++area->GetPostConstructed()->x113c_playerActorsLoading;
x355_24_areaTrackingLoad = true;
}
if (GetActive()) {