summaryrefslogtreecommitdiff
path: root/src/REL/d/a/obj/d_a_obj_barrel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/REL/d/a/obj/d_a_obj_barrel.cpp')
-rw-r--r--src/REL/d/a/obj/d_a_obj_barrel.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/REL/d/a/obj/d_a_obj_barrel.cpp b/src/REL/d/a/obj/d_a_obj_barrel.cpp
index 3f7c6857..acf9eaa7 100644
--- a/src/REL/d/a/obj/d_a_obj_barrel.cpp
+++ b/src/REL/d/a/obj/d_a_obj_barrel.cpp
@@ -537,7 +537,7 @@ void dAcOBarrel_c::executeState_GrabUp() {
dAcNpcCeFriend_c *pCeFriend = mCeFriend.get();
if (0 == sLib::calcTimer(&field_0xE15)) {
if ((pCeLady && pCeLady->fn_12_1C20(this)) || (pCeFriend && pCeFriend->fn_11_17C0(this))) {
- getLinkage().fn_80050EA0(this);
+ getLinkage().forceRemove(this);
quat_0xD80 = quat_0xD60;
mStateMgr.changeState(StateID_Wait);
return;
@@ -827,7 +827,7 @@ void dAcOBarrel_c::initializeState_Rebirth() {
mCyl.ClrCoSet();
mCyl.ClrTgSet();
- getLinkage().fn_80050EA0(this);
+ getLinkage().forceRemove(this);
mStts.SetRank(0);
setObjectProperty(OBJ_PROP_0x200);
@@ -1070,7 +1070,7 @@ void dAcOBarrel_c::fn_293_3DB0() {
extern "C" void fn_800307E0(const mVec3_c &, s32);
void dAcOBarrel_c::fn_293_4200() {
- getLinkage().fn_80050EA0(this);
+ getLinkage().forceRemove(this);
if (field_0xE04 || field_0xE05) {
dAcNpcCeLady_c *pCeLady = mCeLady.get();