thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-05-30 12:41:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix quite a funny blunder in THI bowling ball

Browse source
This commit is contained in:
EmeraldLockdown 2026-05-16 21:23:54 -05:00
parent 9ebb29b0b4
commit a9b1443734
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -184,10 +184,11 @@ void bhv_generic_bowling_ball_spawner_loop(void) {
struct Object *bowlingBall;
if (o->oTimer == 256)
if (o->oTimer == 256) {
o->oTimer = 0;
}
struct Object* player = nearest_player_to_object(o);
struct Object *player = nearest_player_to_object(o);
if (!player) { return; }
if (is_point_within_radius_of_mario(o->oPosX, o->oPosY, o->oPosZ, 1000) || (o->oPosY < player->header.gfx.pos[1])) {
@ -210,12 +211,13 @@ void bhv_generic_bowling_ball_spawner_loop(void) {
}
void bhv_thi_bowling_ball_spawner_loop(void) {
// this is a spawner sync object, which means only the owner of the spawner actually does the spawning
if (!sync_object_is_initialized(o->oSyncID)) {
sync_object_init(o, SYNC_DISTANCE_ONLY_EVENTS);
}
struct Object *bowlingBall;
struct Object* player = nearest_player_to_object(o);
struct Object *player = nearest_player_to_object(o);
if (!player) { return; }
if (o->oTimer == 256) {
@ -229,7 +231,7 @@ void bhv_thi_bowling_ball_spawner_loop(void) {
if ((o->oTimer % 64) != 0) { return; }
if (!is_point_within_radius_of_mario(o->oPosX, o->oPosY, o->oPosZ, 12000)) { return; }
if ((s32)(random_float() * 1.5) != 0) { return; }
if (sync_object_is_owned_locally(o->oSyncID)) { return; }
if (!sync_object_is_owned_locally(o->oSyncID)) { return; }
bowlingBall = spawn_object(o, MODEL_BOWLING_BALL, bhvBowlingBall);
if (bowlingBall == NULL) { return; }