AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-07-04 13:15:52 +00:00
Code Issues Projects Releases Wiki Activity

Stop GCC's whining

Browse Source
This commit is contained in:
Phillip Stephens 2019-11-19 15:15:45 -08:00
parent 8b6dff70b4
commit b23575f2aa
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Runtime/MP1/World/CThardus.cpp
View File

@ -84,9 +84,10 @@ void CThardus::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateMa
} }
case EScriptObjectMessage::SetToMax: { case EScriptObjectMessage::SetToMax: {
for (size_t i = x648_; i < x610_.size() - 1; ++i) { for (size_t i = x648_; i < x610_.size() - 1; ++i) {
if (CEntity* ent = mgr.ObjectById(x610_[i])) if (CEntity* ent = mgr.ObjectById(x610_[i])) {
ent->SetActive(false); ent->SetActive(false);
++x648_; }
++x648_;
} }
break; break;
} }
@ -100,6 +101,7 @@ void CThardus::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateMa
break; break;
} }
case EScriptObjectMessage::Touched: { case EScriptObjectMessage::Touched: {
#if 0
if (TCastToPtr<CCollisionActor> colAct = mgr.ObjectById(uid)) { if (TCastToPtr<CCollisionActor> colAct = mgr.ObjectById(uid)) {
if (TCastToPtr<CPlayer> pl = mgr.ObjectById(colAct->GetLastTouchedObject())) { if (TCastToPtr<CPlayer> pl = mgr.ObjectById(colAct->GetLastTouchedObject())) {
@ -116,6 +118,7 @@ void CThardus::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateMa
} }
} }
} }
#endif
break; break;
} }
case EScriptObjectMessage::Registered: { case EScriptObjectMessage::Registered: {
@ -132,12 +135,12 @@ void CThardus::AcceptScriptMsg(EScriptObjectMessage msg, TUniqueId uid, CStateMa
AddMaterial(EMaterialTypes::CameraPassthrough, mgr); AddMaterial(EMaterialTypes::CameraPassthrough, mgr);
RemoveMaterial(EMaterialTypes::Orbit, mgr); RemoveMaterial(EMaterialTypes::Orbit, mgr);
RemoveMaterial(EMaterialTypes::Target, mgr); RemoveMaterial(EMaterialTypes::Target, mgr);
//sub801ddbe4(mgr); // sub801ddbe4(mgr);
x450_bodyController->SetFallState(pas::EFallState::Two); x450_bodyController->SetFallState(pas::EFallState::Two);
x450_bodyController->Activate(mgr); x450_bodyController->Activate(mgr);
x450_bodyController->BodyStateInfo().SetLocoAnimChangeAtEndOfAnimOnly(true); x450_bodyController->BodyStateInfo().SetLocoAnimChangeAtEndOfAnimOnly(true);
//sub801db560(0, mgr); // sub801db560(0, mgr);
//sub801dec80(); // sub801dec80();
AddMaterial(EMaterialTypes::RadarObject, mgr); AddMaterial(EMaterialTypes::RadarObject, mgr);
break; break;
} }