etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-12-17 22:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prevented star from spawning mid-level-change

Browse source 
Now CCM's slide star spawns correctly.
This commit is contained in:
MysterD 2020-09-19 10:03:36 -07:00
parent 5472f3d13a
commit 6122c4b313
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game/behaviors/spawn_star.inc.c
View file

@ -126,12 +126,13 @@ struct Object *spawn_star(struct Object *sp30, f32 sp34, f32 sp38, f32 sp3C) {
} }
struct Object* spawn_default_star(f32 x, f32 y, f32 z) { struct Object* spawn_default_star(f32 x, f32 y, f32 z) {
if (gSpawnedStarDefault) { return NULL; } if (sCurrPlayMode != PLAY_MODE_NORMAL && sCurrPlayMode != PLAY_MODE_PAUSED) { return NULL; }
if (gSpawnedStarDefault == (1 + o->oBehParams)) { return NULL; }
struct Object *star; struct Object *star;
u32 behParams = o->oBehParams; u32 behParams = o->oBehParams;
star = spawn_star(star, x, y, z); star = spawn_star(star, x, y, z);
star->oBehParams2ndByte = 0; star->oBehParams2ndByte = 0;
gSpawnedStarDefault = TRUE; gSpawnedStarDefault = (1 + o->oBehParams);
network_send_spawn_star(star, 0, x, y, z, behParams); network_send_spawn_star(star, 0, x, y, z, behParams);
return star; return star;
} }