2
0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-11 00:27:43 +00:00

Fix CNewIntroBoss and particle bugs

This commit is contained in:
Jack Andersen
2019-01-04 17:28:02 -10:00
parent 5b55320e9b
commit d60fcc99c9
17 changed files with 151 additions and 92 deletions

View File

@@ -677,9 +677,8 @@ void CActor::MoveScannableObjectInfoToActor(CActor* act, CStateManager& mgr) {
if (!act)
return;
if (act->GetScannableObjectInfo() != GetScannableObjectInfo())
act->x98_scanObjectInfo = x98_scanObjectInfo;
act->x98_scanObjectInfo = x98_scanObjectInfo;
x98_scanObjectInfo = TLockedToken<CScannableObjectInfo>();
act->AddMaterial(EMaterialTypes::Scannable, mgr);
RemoveMaterial(EMaterialTypes::Scannable, mgr);
}