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

Runtime: Make const/non-const getters have the same name

Browse Source 
Makes for a more consistent interface, as getters won't have different
names to remember based off whether or not they're const qualified.
This commit is contained in:
Lioncash
2019-08-14 10:58:54 -04:00
parent 6760f78568
commit afab3e0327
60 changed files with 284 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Runtime/World/CScriptSpecialFunction.cpp
View File

@@ -181,7 +181,7 @@ void CScriptSpecialFunction::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId
case ESpecialFunction::MapStation: {
if (msg == EScriptObjectMessage::Action) {
mgr.MapWorldInfo()->SetMapStationUsed(true);
const_cast<CMapWorld&>(*mgr.WorldNC()->GetMapWorld())
const_cast<CMapWorld&>(*mgr.GetWorld()->GetMapWorld())
.RecalculateWorldSphere(*mgr.MapWorldInfo(), *mgr.GetWorld());
}
break;
@@ -327,7 +327,7 @@ void CScriptSpecialFunction::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId
TAreaId aId = mgr.GetWorld()->GetAreaIdForSaveId(x1bc_areaSaveId);
std::shared_ptr<CWorldLayerState> worldLayerState;
if (aId != kInvalidAreaId)
worldLayerState = mgr.WorldLayerStateNC();
worldLayerState = mgr.WorldLayerState();
else {
std::pair<CAssetId, TAreaId> worldAreaPair = g_MemoryCardSys->GetAreaAndWorldIdForSaveId(x1bc_areaSaveId);
if (worldAreaPair.first.IsValid()) {
@@ -763,7 +763,7 @@ void CScriptSpecialFunction::ThinkActorScale(float dt, CStateManager& mgr) {
if (conn.x0_state != EScriptObjectState::Play || conn.x4_msg != EScriptObjectMessage::Activate)
continue;
if (TCastToPtr<CActor> act = mgr.ObjectById(mgr.GetIdForScript(conn.x8_objId))) {
CModelData* mData = act->ModelData();
CModelData* mData = act->GetModelData();
if (mData && (mData->HasAnimData() || mData->HasNormalModel())) {
zeus::CVector3f scale = mData->GetScale();