mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-05-22 22:24:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adjust function signatures on item equip draw functions.

Browse Source
This commit is contained in:
tk
2026-04-28 23:29:11 -04:00
parent 2148042eaf
commit 57dec39b5e
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/m_player_item_net.c_inc
+5 -3
View File
@@ -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) {
src/game/m_player_item_rod.c_inc
+5 -3
View File
@@ -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) {
src/game/m_player_item_windmill.c_inc
+5 -3
View File
@@ -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) {