mirror/ac-decomp
1
0
Fork 0
mirror of https://github.com/ACreTeam/ac-decomp synced 2026-06-10 12:22:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix setup_main_* fakematches

Browse Source
This commit is contained in:
Prakxo
2024-08-26 17:31:20 +02:00
parent cc47035ba0
commit 7e22c3514b
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/m_player_main_intro.c_inc
+4 -4
View File
@@ -9,12 +9,12 @@ int Player_actor_request_main_intro_all(GAME* game, int flag) {
void Player_actor_setup_main_Intro(ACTOR* actor, GAME* game){
PLAYER_ACTOR* player = (PLAYER_ACTOR*)actor;
int spC;
int sp8;
int anim_idx;
int part_table_idx;
Player_actor_SetupItem_Base1(actor,0, &spC, &sp8, -5.0f);
Player_actor_SetupItem_Base1(actor,0, -5.0f, &anim_idx, &part_table_idx);
player->main_data.intro.timer = 0.0f;
Player_actor_InitAnimation_Base1(actor, game,1.0f, 1.0f, 0.5f, 0.0f, 0, spC, sp8);
Player_actor_InitAnimation_Base1(actor, game, mPlayer_ANIM_WAIT1, anim_idx, 1.0f, 1.0f, 0.5f, 0.0f, part_table_idx);
Player_actor_setup_main_Base(actor, game);
}
src/m_player_main_refuse.c_inc
+7 -5
View File
@@ -6,15 +6,17 @@ int Player_actor_request_main_refuse(GAME* game, int flag) {
return FALSE;
}
void Player_actor_setup_main_Refuse(ACTOR* actor, GAME* game) {
int spC;
int sp8;
void Player_actor_setup_main_Refuse(ACTOR* actor, GAME* game){
PLAYER_ACTOR* player = (PLAYER_ACTOR*)actor;
int anim_idx;
int part_table_idx;
Player_actor_SetupItem_Base1(actor,0, &spC, &sp8, -5.0f);
Player_actor_InitAnimation_Base1(actor, game,1.0f, 1.0f, 0.5f, -5.0f, 0, spC, sp8);
Player_actor_SetupItem_Base1(actor,0, -5.0f, &anim_idx, &part_table_idx);
Player_actor_InitAnimation_Base1(actor, game, mPlayer_ANIM_WAIT1, anim_idx, 1.0f, 1.0f, 0.5f, -5.0f, part_table_idx);
Player_actor_setup_main_Base(actor, game);
}
void Player_actor_Movement_Refuse(ACTOR* actor) {
Player_actor_Movement_Base_Braking(actor);
}
src/m_player_main_refuse_pickup.c_inc
+6 -5
View File
@@ -34,12 +34,13 @@ void Player_actor_Refuse_pickup_demo_ct(ACTOR* actor){
}
void Player_actor_setup_main_Refuse_pickup(ACTOR* actor, GAME* game) {
int spC;
int sp8;
void Player_actor_setup_main_Refuse_pickup(ACTOR* actor, GAME* game){
PLAYER_ACTOR* player = (PLAYER_ACTOR*)actor;
int anim_idx;
int part_table_idx;
Player_actor_SetupItem_Base1(actor,0, &spC, &sp8, -5.0f);
Player_actor_InitAnimation_Base1(actor, game,1.0f, 1.0f, 0.5f, -5.0f, 0, spC, sp8);
Player_actor_SetupItem_Base1(actor,0, -5.0f, &anim_idx, &part_table_idx);
Player_actor_InitAnimation_Base1(actor, game, mPlayer_ANIM_WAIT1, anim_idx, 1.0f, 1.0f, 0.5f, -5.0f, part_table_idx);
Player_actor_setup_main_Base(actor, game);
}