isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-21 07:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Act3Ammo::Remove

Browse Source
This commit is contained in:
Christian Semmler 2024-12-11 12:30:14 -07:00
parent 1296bedd13
commit f6f08db871
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
LEGO1/lego/legoomni/include/act3ammo.h
View File

@ -61,6 +61,7 @@ class Act3Ammo : public LegoPathActor {
void SetUnknown0x158(MxFloat p_unk0x158) { m_unk0x158 = p_unk0x158; }
MxResult Remove();
MxResult Create(Act3* p_a3, MxU32 p_isPizza, MxS32 p_index);
MxResult FUN_10053b40(Vector3& p_srcLoc, Vector3& p_srcDir, Vector3& p_srcUp);
MxResult FUN_10053cb0(LegoPathController* p_p, LegoPathBoundary* p_boundary, MxFloat p_unk0x19c);

21
LEGO1/lego/legoomni/src/actors/act3ammo.cpp
View File

@ -2,6 +2,8 @@
#include "legocachesoundmanager.h"
#include "legocharactermanager.h"
#include "legopathboundary.h"
#include "legopathcontroller.h"
#include "legosoundmanager.h"
#include "misc.h"
#include "roi/legoroi.h"
@ -39,6 +41,25 @@ void Act3Ammo::Destroy(MxBool p_fromDestructor)
}
}
// FUNCTION: LEGO1 0x10053930
// FUNCTION: BETA10 0x1001d7d0
MxResult Act3Ammo::Remove()
{
assert(IsValid());
assert(m_roi && m_pathController);
CharacterManager()->ReleaseActor(m_roi->GetName());
m_roi = NULL;
if (m_boundary != NULL) {
m_boundary->RemoveActor(this);
}
m_pathController->RemoveActor(this);
m_ammoFlag = 0;
return SUCCESS;
}
// FUNCTION: LEGO1 0x10053980
// FUNCTION: BETA10 0x1001d8b3
MxResult Act3Ammo::Create(Act3* p_a3, MxU32 p_isPizza, MxS32 p_index)