diff --git a/src/game/m_player_item_net.c_inc b/src/game/m_player_item_net.c_inc index c1512ef5..ed712370 100644 --- a/src/game/m_player_item_net.c_inc +++ b/src/game/m_player_item_net.c_inc @@ -210,8 +210,10 @@ static int Player_actor_Item_main_net_stop(ACTOR* actor, GAME* game) { return ret; } -static void Player_actor_Item_draw_net_After_dummy_net(ACTOR* actor) { - PLAYER_ACTOR* player = (PLAYER_ACTOR*)actor; +static void Player_actor_Item_draw_net_After_dummy_net(void* arg, GAME* game, cKF_SkeletonInfo_R_c* keyframe, + Gfx** joint_shape, u8* joint_flags, s_xyz* joint_rot, + xyz_t* joint_pos) { + PLAYER_ACTOR* player = (PLAYER_ACTOR*)arg; Matrix_rotateXYZ(player->net_angle.x, player->net_angle.y, player->net_angle.z, MTX_MULT); } @@ -223,7 +225,7 @@ static int Player_actor_Item_draw_net_After(GAME* game, cKF_SkeletonInfo_R_c* ke Gfx** joint_shape, u8* joint_flags, void* arg, s_xyz* joint_rot, xyz_t* joint_pos) { static const mPlayer_item_net_draw_proc proc[] = { - NULL, NULL, NULL, (mPlayer_item_net_draw_proc)Player_actor_Item_draw_net_After_dummy_net, NULL, NULL, + NULL, NULL, NULL, Player_actor_Item_draw_net_After_dummy_net, NULL, NULL, }; if (joint_idx >= 0 && joint_idx < 6) { diff --git a/src/game/m_player_item_rod.c_inc b/src/game/m_player_item_rod.c_inc index 9ea8bd48..b85a5b75 100644 --- a/src/game/m_player_item_rod.c_inc +++ b/src/game/m_player_item_rod.c_inc @@ -328,8 +328,10 @@ static int Player_actor_Item_main_rod_putaway(ACTOR* actor, GAME* game) { return 0; } -static void Player_actor_Item_draw_net_After_main4_sao(ACTOR* actor) { - PLAYER_ACTOR* player = (PLAYER_ACTOR*)actor; +static void Player_actor_Item_draw_net_After_main4_sao(void* arg, GAME* game, cKF_SkeletonInfo_R_c* keyframe, + Gfx** joint_shape, u8* joint_flags, s_xyz* joint_rot, + xyz_t* joint_pos) { + PLAYER_ACTOR* player = (PLAYER_ACTOR*)arg; Matrix_Position_VecX(1050.0f, &player->item_rod_top_pos); } @@ -341,7 +343,7 @@ static int Player_actor_Item_draw_rod_After(GAME* game, cKF_SkeletonInfo_R_c* ke Gfx** joint_shape, u8* joint_flags, void* arg, s_xyz* joint_rot, xyz_t* joint_pos) { static const mPlayer_item_net_draw_proc proc[] = { - NULL, NULL, NULL, NULL, (mPlayer_item_rod_draw_proc)Player_actor_Item_draw_net_After_main4_sao, + NULL, NULL, NULL, NULL, Player_actor_Item_draw_net_After_main4_sao, }; if (joint_idx >= 0 && joint_idx < 5) { diff --git a/src/game/m_player_item_windmill.c_inc b/src/game/m_player_item_windmill.c_inc index 86ac8e57..e9d18688 100644 --- a/src/game/m_player_item_windmill.c_inc +++ b/src/game/m_player_item_windmill.c_inc @@ -108,8 +108,10 @@ static int Player_actor_Item_main_windmill_normal(ACTOR* actor, GAME* game) { return 0; } -static void Player_actor_Item_draw_windmill_After_kaza1_fan(ACTOR* actor) { - PLAYER_ACTOR* player = (PLAYER_ACTOR*)actor; +static void Player_actor_Item_draw_windmill_After_kaza1_fan(void* arg, GAME* game, cKF_SkeletonInfo_R_c* keyframe, + Gfx** joint_shape, u8* joint_flags, s_xyz* joint_rot, + xyz_t* joint_pos) { + PLAYER_ACTOR* player = (PLAYER_ACTOR*)arg; s_xyz* angle = &player->windmill_angle; xyz_t* item_end = &player->other_item_end_pos; @@ -132,7 +134,7 @@ static int Player_actor_Item_draw_windmill_After(GAME* game, cKF_SkeletonInfo_R_ static const mPlayer_item_windmill_draw_proc proc[] = { NULL, NULL, - (mPlayer_item_windmill_draw_proc)Player_actor_Item_draw_windmill_After_kaza1_fan, + Player_actor_Item_draw_windmill_After_kaza1_fan, }; if (joint_idx >= 0 && joint_idx < 3) {