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

View File

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

View File

@ -4,7 +4,7 @@ void bhv_cannon_closed_init(void) {
struct Object *cannon;
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.
cannon = spawn_object(o, MODEL_CANNON_BASE, bhvCannon);
cannon->parentObj = cannon;

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) {
*shouldOverride = TRUE;
*shouldOwn = (gNetworkType == NT_SERVER);
*shouldOwn = (get_network_player_smallest_global() == gNetworkPlayerLocal);
}
u8 bhv_eyerok_boss_ignore_if_true(void) {