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

Possible fix for big bully spawn

Browse source
This commit is contained in:
MysterD 2020-10-11 19:16:21 -07:00
parent d4f92ed209
commit 8b6bfc2369
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game/behaviors/bully.inc.c
View file

@ -28,6 +28,15 @@ static u8 bhv_bully_ignore_if_true(void) {
return (o->oAction == BULLY_ACT_LAVA_DEATH) || (o->oAction == BULLY_ACT_DEATH_PLANE_DEATH);
}
static void bhv_bully_override_ownership(u8* shouldOverride, u8* shouldOwn) {
if ((o->oAction == BULLY_ACT_LAVA_DEATH) || (o->oAction == BULLY_ACT_DEATH_PLANE_DEATH) || (o->oIntangibleTimer != 0)) {
*shouldOverride = TRUE;
*shouldOwn = FALSE;
} else {
*shouldOverride = FALSE;
}
}
static void bhv_bully_network_init(void) {
struct SyncObject* so = network_init_object(o, 4000.0f);
network_init_object_field(o, &o->oFlags);
@ -39,6 +48,7 @@ static void bhv_bully_network_init(void) {
network_init_object_field(o, &o->oBullyMarioCollisionAngle);
so->syncDeathEvent = FALSE;
so->ignore_if_true = bhv_bully_ignore_if_true;
so->override_ownership = bhv_bully_override_ownership;
}
void bhv_small_bully_init(void) {