print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix: Blue coin duplication (#787)

Browse Source 
Blue coins can be collected more than once if collected on the final frame of the switch timer when BLUE_COIN_SWITCH_RETRY is enabled. Fixing this on its own isn't enough though, as the blue coin switch also doesn't check for whether that coin was collected when it resets.
This commit is contained in:
Gregory Heskett
2024-05-03 01:54:43 -04:00
committed by GitHub
parent 4d260f6885
commit 520a6f3aed
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/game/behaviors/blue_coin.inc.c
View File

@@ -49,12 +49,6 @@ void bhv_hidden_blue_coin_loop(void) {
cur_obj_enable_rendering(); cur_obj_enable_rendering();
cur_obj_become_tangible(); cur_obj_become_tangible();
// Delete the coin once collected
if (o->oInteractStatus & INT_STATUS_INTERACTED) {
spawn_object(o, MODEL_SPARKLES, bhvCoinSparklesSpawner);
obj_mark_for_deletion(o);
}
// After 200 frames of waiting and 20 2-frame blinks (for 240 frames total), // After 200 frames of waiting and 20 2-frame blinks (for 240 frames total),
// delete the object. // delete the object.
if (cur_obj_wait_then_blink(200, 20)) { if (cur_obj_wait_then_blink(200, 20)) {
@@ -69,6 +63,12 @@ void bhv_hidden_blue_coin_loop(void) {
break; break;
} }
// Delete the coin once collected
if (o->oInteractStatus & INT_STATUS_INTERACTED) {
spawn_object(o, MODEL_SPARKLES, bhvCoinSparklesSpawner);
obj_mark_for_deletion(o);
}
o->oInteractStatus = INT_STATUS_NONE; o->oInteractStatus = INT_STATUS_NONE;
} }
@@ -158,7 +158,11 @@ void bhv_blue_coin_switch_loop(void) {
load_object_collision_model(); load_object_collision_model();
break; break;
case BLUE_COIN_SWITCH_ACT_EXTENDING: case BLUE_COIN_SWITCH_ACT_EXTENDING:
if (o->oTimer > 3) { if (cur_obj_nearest_object_with_behavior(bhvHiddenBlueCoin) == NULL) {
// This code can be executed if the last blue coin is collected at the very end of the timer.
spawn_mist_particles_variable(0, 0, 46.0f);
obj_mark_for_deletion(o);
} else if (o->oTimer > 3) {
// Set to BLUE_COIN_SWITCH_ACT_IDLE // Set to BLUE_COIN_SWITCH_ACT_IDLE
o->oAction = BLUE_COIN_SWITCH_ACT_IDLE; o->oAction = BLUE_COIN_SWITCH_ACT_IDLE;
} else { } else {