summaryrefslogtreecommitdiff
path: root/src/d/a/obj/d_a_obj_arrow.cpp
diff options
context:
space:
mode:
authorElijah Thomas <42302100+elijah-thomas774@users.noreply.github.com>2025-05-25 15:51:35 -0400
committerGitHub <noreply@github.com>2025-05-25 15:51:35 -0400
commitfd7d30d32283d03a412e8c401d04418351cf686a (patch)
treee88bed25f474f06552cd7a7ea7067a0beead4414 /src/d/a/obj/d_a_obj_arrow.cpp
parent018ef1971cd53aa8e78154789bcf6cac2f19b603 (diff)
d_linkage is largely done (#176)
Diffstat (limited to 'src/d/a/obj/d_a_obj_arrow.cpp')
-rw-r--r--src/d/a/obj/d_a_obj_arrow.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/d/a/obj/d_a_obj_arrow.cpp b/src/d/a/obj/d_a_obj_arrow.cpp
index 42e1965d..2b9bbb57 100644
--- a/src/d/a/obj/d_a_obj_arrow.cpp
+++ b/src/d/a/obj/d_a_obj_arrow.cpp
@@ -1,7 +1,6 @@
#include "d/a/obj/d_a_obj_arrow.h"
#include "c/c_math.h"
-#include "d/a/d_a_player.h"
#include "d/col/c/c_cc_d.h"
#include "nw4r/types_nw4r.h"
@@ -38,7 +37,7 @@ const dCcD_SrcSph dAcArrow_c::sCc2 = {
// clang-format on
-bool hitCallback(dAcObjBase_c *i_actorA, cCcD_Obj *i_objInfA, dAcObjBase_c *i_actorB, cCcD_Obj *i_objInfB) {
+bool dAcArrow_atHitCallback(dAcObjBase_c *i_actorA, cCcD_Obj *i_objInfA, dAcObjBase_c *i_actorB, cCcD_Obj *i_objInfB) {
static_cast<dAcArrow_c *>(i_actorA)->hitCallback(i_objInfA, i_actorB, i_objInfB);
return true;
}
@@ -70,7 +69,7 @@ int dAcArrow_c::create() {
mCcCps.Set(sCc1);
mCcCps.SetStts(mStts);
mCcCps.SetAtFlag(0x2000);
- mCcCps.SetAtCallback(::hitCallback);
+ mCcCps.SetAtCallback(dAcArrow_atHitCallback);
mCcSph.Set(sCc2);
mCcSph.SetStts(mStts);