Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bowser, cannon door, and eyerok no longer require server to be in level 

All have been switched from being owned by the server to being owned by
the player with the lowest global ID in the level.
This commit is contained in:
MysterD 2021-06-15 21:04:51 -07:00
parent f60b861d73
commit 939318041e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/behaviors/bowser.inc.c
View File

@ -1305,7 +1305,7 @@ void bhv_bowser_override_ownership(u8* shouldOverride, u8* shouldOwn) {
if (tiltingTimer > 0) { if (tiltingTimer > 0) {
tiltingTimer--; tiltingTimer--;
*shouldOverride = TRUE; *shouldOverride = TRUE;
*shouldOwn = (gNetworkType == NT_SERVER); *shouldOwn = (get_network_player_smallest_global() == gNetworkPlayerLocal);
} }
} }

2
src/game/behaviors/cannon_door.inc.c
View File

@ -4,7 +4,7 @@ void bhv_cannon_closed_init(void) {
struct Object *cannon; struct Object *cannon;
if (save_file_is_cannon_unlocked() == 1) { if (save_file_is_cannon_unlocked() == 1) {
if (!gNetworkAreaLoaded || gNetworkType == NT_SERVER) { if (!gNetworkAreaLoaded || get_network_player_smallest_global() == gNetworkPlayerLocal) {
// If the cannon is open, spawn a cannon and despawn the object. // If the cannon is open, spawn a cannon and despawn the object.
cannon = spawn_object(o, MODEL_CANNON_BASE, bhvCannon); cannon = spawn_object(o, MODEL_CANNON_BASE, bhvCannon);
cannon->parentObj = cannon; cannon->parentObj = cannon;

2
src/game/behaviors/eyerok.inc.c
View File

@ -35,7 +35,7 @@ static struct Object* eyerok_spawn_hand(s16 side, s32 model, const BehaviorScrip
void bhv_eyerok_boss_override_ownership(u8* shouldOverride, u8* shouldOwn) { void bhv_eyerok_boss_override_ownership(u8* shouldOverride, u8* shouldOwn) {
*shouldOverride = TRUE; *shouldOverride = TRUE;
*shouldOwn = (gNetworkType == NT_SERVER); *shouldOwn = (get_network_player_smallest_global() == gNetworkPlayerLocal);
} }
u8 bhv_eyerok_boss_ignore_if_true(void) { u8 bhv_eyerok_boss_ignore_if_true(void) {