Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Piranha plant music only plays if local player is nearby

This commit is contained in:
MysterD 2023-04-22 01:51:12 -07:00
parent 71280a7496
commit ffc47be223
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/behaviors/piranha_plant.inc.c
View File

@ -91,13 +91,15 @@ void piranha_plant_act_sleeping(void) {
#endif #endif
struct Object* player = nearest_player_to_object(o); struct Object* player = nearest_player_to_object(o);
struct Object* localPlayer = gMarioStates[0].marioObj;
s32 distanceToPlayer = player ? dist_between_objects(o, player) : 10000; s32 distanceToPlayer = player ? dist_between_objects(o, player) : 10000;
s32 distanceToLocalPlayer = localPlayer ? dist_between_objects(o, localPlayer) : 10000;
if (distanceToPlayer < 400.0f) { if (distanceToPlayer < 400.0f) {
if (mario_moving_fast_enough_to_make_piranha_plant_bite()) { if (mario_moving_fast_enough_to_make_piranha_plant_bite()) {
o->oAction = PIRANHA_PLANT_ACT_WOKEN_UP; o->oAction = PIRANHA_PLANT_ACT_WOKEN_UP;
if (sync_object_is_owned_locally(o->oSyncID)) { network_send_object(o); } if (sync_object_is_owned_locally(o->oSyncID)) { network_send_object(o); }
} }
} else if (distanceToPlayer < 1000.0f) { } else if (distanceToLocalPlayer < 1000.0f) {
play_secondary_music(SEQ_EVENT_PIRANHA_PLANT, 0, 255, 1000); play_secondary_music(SEQ_EVENT_PIRANHA_PLANT, 0, 255, 1000);
o->oPiranhaPlantSleepMusicState = PIRANHA_PLANT_SLEEP_MUSIC_PLAYING; o->oPiranhaPlantSleepMusicState = PIRANHA_PLANT_SLEEP_MUSIC_PLAYING;
} else if (o->oPiranhaPlantSleepMusicState == PIRANHA_PLANT_SLEEP_MUSIC_PLAYING) { } else if (o->oPiranhaPlantSleepMusicState == PIRANHA_PLANT_SLEEP_MUSIC_PLAYING) {