From 83fe6139c84d89237821a334789a1d744d32e7ce Mon Sep 17 00:00:00 2001 From: MysterD Date: Mon, 30 Aug 2021 18:35:47 -0700 Subject: [PATCH] Resync bhv1upHiddenInPoleSpawner to prevent a sync table mismatch --- src/game/behaviors/mushroom_1up.inc.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/game/behaviors/mushroom_1up.inc.c b/src/game/behaviors/mushroom_1up.inc.c index 929f4a58..bbcc9c10 100644 --- a/src/game/behaviors/mushroom_1up.inc.c +++ b/src/game/behaviors/mushroom_1up.inc.c @@ -343,20 +343,11 @@ void bhv_1up_hidden_in_pole_trigger_loop(void) { } void bhv_1up_hidden_in_pole_spawner_loop(void) { - if (!network_sync_object_initialized(o)) { - network_init_object(o, SYNC_DISTANCE_ONLY_EVENTS); - network_init_object_field(o, &o->o1UpForceSpawn); - } - - s8 sp2F; - - if (o->o1UpForceSpawn || is_point_within_radius_of_mario(o->oPosX, o->oPosY, o->oPosZ, 700)) { - spawn_object_relative(2, 0, 50, 0, o, MODEL_1UP, bhvHidden1upInPole); - for (sp2F = 0; sp2F < 2; sp2F++) { - spawn_object_relative(0, 0, sp2F * -200, 0, o, MODEL_NONE, bhvHidden1upInPoleTrigger); - } - o->o1UpForceSpawn = TRUE; - network_send_object(o); - o->activeFlags = ACTIVE_FLAG_DEACTIVATED; + // immediately break this into bhvHidden1upInPole and bhvHidden1upInPoleTrigger + // this makes syncing easier + spawn_object_relative(2, 0, 50, 0, o, MODEL_1UP, bhvHidden1upInPole); + for (s8 sp2F = 0; sp2F < 2; sp2F++) { + spawn_object_relative(0, 0, sp2F * -200, 0, o, MODEL_NONE, bhvHidden1upInPoleTrigger); } + o->activeFlags = ACTIVE_FLAG_DEACTIVATED; }