From 7e22c3514bb31698daf92b0f4dc503b758ba7240 Mon Sep 17 00:00:00 2001 From: Prakxo Date: Mon, 26 Aug 2024 17:31:20 +0200 Subject: [PATCH] fix setup_main_* fakematches --- src/m_player_main_intro.c_inc | 8 ++++---- src/m_player_main_refuse.c_inc | 12 +++++++----- src/m_player_main_refuse_pickup.c_inc | 11 ++++++----- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/m_player_main_intro.c_inc b/src/m_player_main_intro.c_inc index 719bed9b..b5591cf7 100644 --- a/src/m_player_main_intro.c_inc +++ b/src/m_player_main_intro.c_inc @@ -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); } diff --git a/src/m_player_main_refuse.c_inc b/src/m_player_main_refuse.c_inc index b8babba3..85262103 100644 --- a/src/m_player_main_refuse.c_inc +++ b/src/m_player_main_refuse.c_inc @@ -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); } diff --git a/src/m_player_main_refuse_pickup.c_inc b/src/m_player_main_refuse_pickup.c_inc index 9e67ccbb..7cd70e52 100644 --- a/src/m_player_main_refuse_pickup.c_inc +++ b/src/m_player_main_refuse_pickup.c_inc @@ -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); }