thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-04-22 01:52:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Possibly fixed rare invisible cannon bug

Browse source
This commit is contained in:
MysterD 2020-10-06 21:03:08 -07:00
parent 93b2c4213d
commit d2e1b6e5a0
1 changed files with 39 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/game/behaviors/cannon.inc.c
View file

@ -14,8 +14,6 @@ void opened_cannon_act_0(void) {
o->oMoveAngleYaw = (s16)(o->oBehParams2ndByte << 8);
o->oCannonUnkF4 = 0;
o->oCannonUnk10C = 0;
cur_obj_enable_rendering();
cur_obj_become_tangible();
}
cur_obj_become_tangible();
cur_obj_enable_rendering();
@ -151,7 +149,7 @@ u8 cannon_ignore_remote_updates(void) {
return ((gNetworkType == NT_SERVER) && o->oCannonIsLocal);
}
static void cannon_on_received_pos(u8 fromLocalIndex) {
static void cannon_on_received_post(u8 fromLocalIndex) {
// check if we're on in the cannon too
struct MarioState* m = &gMarioStates[0];
if (m->action != ACT_IN_CANNON) { return; }
@ -175,11 +173,46 @@ static void cannon_on_received_pos(u8 fromLocalIndex) {
cur_obj_enable_rendering();
}
static void bhv_cannon_base_sanity_check(void) {
// figure out if it's still in use
u8 inUse = FALSE;
if (o->oCannonIsLocal) {
inUse = (gMarioStates[0].action == ACT_IN_CANNON && gMarioStates[0].interactObj == o);
} else {
for (int i = 0; i < MAX_PLAYERS; i++) {
if (!is_player_active(&gMarioStates[i])) { continue; }
if (gMarioStates[i].action == ACT_IN_CANNON && gMarioStates[i].interactObj == o) {
inUse = TRUE;
break;
}
}
}
// figure out if it is visible
u8 isVisible = (o->header.gfx.node.flags & GRAPH_RENDER_ACTIVE);
// ensure that it is visibile when it should be
static u8 visibilitySanity = 0;
if (isVisible == !inUse) {
visibilitySanity = 0;
return;
}
// enforce good state if out of whack
if (!isVisible && !inUse) {
if (visibilitySanity++ > 15) {
o->oAction = 0;
o->oTimer = 0;
visibilitySanity = 0;
}
}
}
void bhv_cannon_base_loop(void) {
if (!network_sync_object_initialized(o)) {
struct SyncObject* so = network_init_object(o, SYNC_DISTANCE_ONLY_EVENTS);
so->ignore_if_true = cannon_ignore_remote_updates;
so->on_received_post = cannon_on_received_pos;
so->on_received_post = cannon_on_received_post;
network_init_object_field(o, &o->oAction);
network_init_object_field(o, &o->oPrevAction);
network_init_object_field(o, &o->oTimer);
@ -192,6 +225,8 @@ void bhv_cannon_base_loop(void) {
network_init_object_field(o, &o->oCannonUnkF4);
}
bhv_cannon_base_sanity_check();
if (o->oAction != 0 && !o->oCannonIsLocal) {
cur_obj_push_mario_away_from_cylinder(220, 300);
}