diff options
| author | robojumper <robojumper@gmail.com> | 2026-05-04 21:54:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-04 21:54:51 +0200 |
| commit | ddb116187922a3f73ae3c97a136f499b7d724a2c (patch) | |
| tree | 1acf2b7c88534079d96ea870aabc424fc40bdcca /src/d/d_linkage.cpp | |
| parent | 434b1bef7f5583ccdb8ff1af6b9e7a711317ec94 (diff) | |
| parent | 24624a4fd2076a3a32b3484aec1067a595e52db3 (diff) | |
Merge pull request #310 from robojumper/simple-remly-names
Simple Remly field names
Diffstat (limited to 'src/d/d_linkage.cpp')
| -rw-r--r-- | src/d/d_linkage.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/d/d_linkage.cpp b/src/d/d_linkage.cpp index 3c44fafd..f473b461 100644 --- a/src/d/d_linkage.cpp +++ b/src/d/d_linkage.cpp @@ -115,7 +115,7 @@ void dLinkage_c::fn_80050E40(dAcObjBase_c *pActor, const f32 speed, const f32 ve pActor->mAngle.y = rot; } -void dLinkage_c::fn_80050EA0(dAcObjBase_c *pActor) { +void dLinkage_c::forceRemove(dAcObjBase_c *pActor) { mState = STATE_DELETE; fn_80050EB0(pActor); } @@ -178,7 +178,7 @@ void dLinkage_c::bushTpFunc(dBgS_Acch &acch) { if (mType == CONNECTION_7 && mControllingActor.p_owner == player) { if (!checkFlag(0x10000)) { if (acch.ChkWallHit(nullptr)) { - fn_80050EA0(player->getWhippedItem()); + forceRemove(player->getWhippedItem()); return; } field_0x1A = 3; @@ -210,7 +210,7 @@ void dLinkage_c::fn_80051190(dAcObjBase_c *pActor) { } pLinkedActor = nullptr; - fn_80050EA0(pActor); + forceRemove(pActor); } void dLinkage_c::fn_800511E0(dAcObjBase_c *pActor) { |