thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Racing Penguin: remove airborn check, fix end of race desync

Browse source
This commit is contained in:
MysterD 2020-09-08 09:15:43 -07:00
parent a804981b2a
commit b9924253bb
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/game/behaviors/racing_penguin.inc.c
View file

@ -27,7 +27,8 @@ void bhv_racing_penguin_init(void) {
} }
static void racing_penguin_act_wait_for_mario(void) { static void racing_penguin_act_wait_for_mario(void) {
if (o->oTimer > o->oRacingPenguinInitTextCooldown && o->oPosY - gMarioObject->oPosY <= 0.0f struct Object* player = nearest_player_to_object(o);
if (o->oTimer > o->oRacingPenguinInitTextCooldown && o->oPosY - player->oPosY <= 0.0f
&& cur_obj_can_mario_activate_textbox_2(&gMarioStates[0], 400.0f, 400.0f)) { && cur_obj_can_mario_activate_textbox_2(&gMarioStates[0], 400.0f, 400.0f)) {
o->oAction = RACING_PENGUIN_ACT_SHOW_INIT_TEXT; o->oAction = RACING_PENGUIN_ACT_SHOW_INIT_TEXT;
} }
@ -99,7 +100,8 @@ static void racing_penguin_act_race(void) {
o->oRacingPenguinReachedBottom = TRUE; o->oRacingPenguinReachedBottom = TRUE;
o->oAction = RACING_PENGUIN_ACT_FINISH_RACE; o->oAction = RACING_PENGUIN_ACT_FINISH_RACE;
} else { } else {
targetSpeed = o->oPosY - gMarioObject->oPosY; struct Object* player = nearest_player_to_object(o);
targetSpeed = o->oPosY - player->oPosY;
minSpeed = 70.0f; minSpeed = 70.0f;
cur_obj_play_sound_1(SOUND_AIR_ROUGH_SLIDE); cur_obj_play_sound_1(SOUND_AIR_ROUGH_SLIDE);
@ -126,7 +128,10 @@ static void racing_penguin_act_race(void) {
} }
} }
u8 isInAir = FALSE; // Removed the in-air shortcut check due to inconsistent detection and the
// fact that one player can fall off while the other player completes the
// race.
/*u8 isInAir = FALSE;
for (int i = 0; i < MAX_PLAYERS; i++) { for (int i = 0; i < MAX_PLAYERS; i++) {
if (!is_player_active(&gMarioStates[i])) { continue; } if (!is_player_active(&gMarioStates[i])) { continue; }
isInAir = isInAir || mario_is_in_air_action(&gMarioStates[i]); isInAir = isInAir || mario_is_in_air_action(&gMarioStates[i]);
@ -139,7 +144,7 @@ static void racing_penguin_act_race(void) {
} }
} else { } else {
o->oTimer = 0; o->oTimer = 0;
} }*/
} }
static void racing_penguin_act_finish_race(void) { static void racing_penguin_act_finish_race(void) {