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

Desync fixes for hoot, piranha, spiny

Browse source
This commit is contained in:
MysterD 2020-10-14 23:25:59 -07:00
parent c50794773c
commit 71bc444fa2
4 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/game/behaviors/hoot.inc.c
View file

@ -2,6 +2,10 @@
static u8 localTalkToHoot = 0; static u8 localTalkToHoot = 0;
static u8 bhv_hoot_ignore_if_true(void) {
return (gMarioStates[0].action == ACT_RIDING_HOOT) && (gMarioStates[0].usedObj == o);
}
void bhv_hoot_init(void) { void bhv_hoot_init(void) {
cur_obj_init_animation(0); cur_obj_init_animation(0);
@ -13,9 +17,11 @@ void bhv_hoot_init(void) {
cur_obj_become_intangible(); cur_obj_become_intangible();
localTalkToHoot = 0; localTalkToHoot = 0;
network_init_object(o, 4000.0f); struct SyncObject* so = network_init_object(o, 4000.0f);
so->ignore_if_true = bhv_hoot_ignore_if_true;
network_init_object_field(o, &o->oHootAvailability); network_init_object_field(o, &o->oHootAvailability);
network_init_object_field(o, &o->oMoveAnglePitch); network_init_object_field(o, &o->oMoveAnglePitch);
network_init_object_field(o, &o->header.gfx.unk38.animFrame);
} }
// sp28 = arg0 // sp28 = arg0

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

@ -312,6 +312,8 @@ s32 mario_moving_fast_enough_to_make_piranha_plant_bite(void) {
* Plant start biting again. Otherwise, make it go back to sleep. * Plant start biting again. Otherwise, make it go back to sleep.
*/ */
void piranha_plant_act_stopped_biting(void) { void piranha_plant_act_stopped_biting(void) {
struct Object* player = nearest_player_to_object(o);
int distanceToPlayer = dist_between_objects(o, player);
cur_obj_become_intangible(); cur_obj_become_intangible();
cur_obj_init_animation_with_sound(6); cur_obj_init_animation_with_sound(6);
@ -326,7 +328,7 @@ void piranha_plant_act_stopped_biting(void) {
* of the Piranha Plant during the short time the Piranha Plant's nod * of the Piranha Plant during the short time the Piranha Plant's nod
* animation plays. * animation plays.
*/ */
if (o->oDistanceToMario < 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_BITING; o->oAction = PIRANHA_PLANT_ACT_BITING;
} }

2
src/game/behaviors/spiny.inc.c
View file

@ -212,6 +212,8 @@ void bhv_spiny_update(void) {
} }
} }
obj_set_hitbox(o, &sSpinyHitbox);
switch (o->oAction) { switch (o->oAction) {
case SPINY_ACT_WALK: case SPINY_ACT_WALK:
spiny_act_walk(); spiny_act_walk();

3
src/game/behaviors/wiggler.inc.c
View file

@ -320,7 +320,8 @@ static void wiggler_act_jumped_on(void) {
if (should_start_or_continue_dialog(marioState, o) && cur_obj_update_dialog_with_cutscene(marioState, 2, 0, CUTSCENE_DIALOG, attackText[o->oHealth - 2], wiggler_act_jumped_on_continue_dialog) != 0) { if (should_start_or_continue_dialog(marioState, o) && cur_obj_update_dialog_with_cutscene(marioState, 2, 0, CUTSCENE_DIALOG, attackText[o->oHealth - 2], wiggler_act_jumped_on_continue_dialog) != 0) {
// Because we don't want the wiggler to disappear after being // Because we don't want the wiggler to disappear after being
// defeated, we leave its health at 1 // defeated, we leave its health at 1
if (--o->oHealth == 1) { if (--o->oHealth <= 1) {
o->oHealth = 1;
o->oAction = WIGGLER_ACT_SHRINK; o->oAction = WIGGLER_ACT_SHRINK;
cur_obj_become_intangible(); cur_obj_become_intangible();
} else { } else {