summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJasper St. Pierre <jstpierre@mecheye.net>2023-10-12 00:09:33 -0700
committerJasper St. Pierre <jstpierre@mecheye.net>2023-10-12 00:09:33 -0700
commit9d2e8e121bbc46fad80b86b062eb956ffbd415a0 (patch)
tree5546a05f31896722e50a022f891fa81f82b386ba /include
parentbfc681d4862906d1e4be5dfe1f7b2eeb44fbeeaa (diff)
f_op_actor_mng matches
Diffstat (limited to 'include')
-rw-r--r--include/d/actor/d_a_player.h2
-rw-r--r--include/d/actor/d_a_player_link.h2
-rw-r--r--include/f_op/f_op_actor_mng.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/include/d/actor/d_a_player.h b/include/d/actor/d_a_player.h
index 1b7fe770..3b13f16d 100644
--- a/include/d/actor/d_a_player.h
+++ b/include/d/actor/d_a_player.h
@@ -177,7 +177,7 @@ public:
virtual void getBaseAnimeFrame() = 0;
virtual void getItemID() const;
virtual void getThrowBoomerangID() const;
- virtual void getGrabActorID() const;
+ virtual u32 getGrabActorID() const;
virtual void checkGrabBarrel();
virtual void checkPlayerNoDraw();
virtual void checkRopeTag();
diff --git a/include/d/actor/d_a_player_link.h b/include/d/actor/d_a_player_link.h
index eeadc80c..96c533d7 100644
--- a/include/d/actor/d_a_player_link.h
+++ b/include/d/actor/d_a_player_link.h
@@ -1020,7 +1020,7 @@ public:
virtual void getBaseAnimeFrame();
virtual void getItemID() const;
virtual void getThrowBoomerangID() const;
- virtual void getGrabActorID() const;
+ virtual u32 getGrabActorID() const;
virtual void checkGrabBarrel();
virtual void checkPlayerNoDraw();
virtual void checkRopeTag();
diff --git a/include/f_op/f_op_actor_mng.h b/include/f_op/f_op_actor_mng.h
index bfc9ebe5..384aeed5 100644
--- a/include/f_op/f_op_actor_mng.h
+++ b/include/f_op/f_op_actor_mng.h
@@ -292,7 +292,7 @@ inline BOOL fopAcM_isSwitch(fopAc_ac_c* pActor, int sw) {
return dComIfGs_isSwitch(sw, fopAcM_GetHomeRoomNo(pActor));
}
-inline fopAc_ac_c* fopAcM_SearchByID(unsigned int id) {
+inline fopAc_ac_c* fopAcM_SearchByID(u32 id) {
return (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)fpcSch_JudgeByID, &id);
}