Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed tree leaf particle check from hardcoded levels, to gEnvFxMode

This commit is contained in:
MysterD 2022-06-04 00:43:04 -07:00
parent 4a93e44779
commit 6e087de181
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/game/behaviors/tree_particles.inc.c
View File

@ -1,5 +1,7 @@
// tree_particles.c.inc // tree_particles.c.inc
#include "src/game/envfx_snow.h"
void bhv_tree_snow_or_leaf_loop(void) { void bhv_tree_snow_or_leaf_loop(void) {
cur_obj_update_floor_height(); cur_obj_update_floor_height();
if (o->oTimer == 0) { if (o->oTimer == 0) {
@ -32,17 +34,12 @@ void bhv_tree_snow_or_leaf_loop(void) {
} }
void bhv_snow_leaf_particle_spawn_init(void) { void bhv_snow_leaf_particle_spawn_init(void) {
s32 isSnow = (gEnvFxMode == ENVFX_SNOW_NORMAL || gEnvFxMode == ENVFX_SNOW_BLIZZARD);
struct Object *obj; // Either snow or leaf struct Object *obj; // Either snow or leaf
UNUSED s32 unused;
s32 isSnow;
f32 scale; f32 scale;
UNUSED s32 unused2; UNUSED s32 unused2;
struct Object* player = nearest_player_to_object(o); struct Object* player = nearest_player_to_object(o);
player->oActiveParticleFlags &= ~0x2000; player->oActiveParticleFlags &= ~0x2000;
if (gCurrLevelNum == LEVEL_CCM || gCurrLevelNum == LEVEL_SL)
isSnow = 1;
else
isSnow = 0;
if (isSnow) { if (isSnow) {
if (random_float() < 0.5) { if (random_float() < 0.5) {
obj = spawn_object(o, MODEL_WHITE_PARTICLE_DL, bhvTreeSnow); obj = spawn_object(o, MODEL_WHITE_PARTICLE_DL, bhvTreeSnow);