kelson8/Render96ex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes from Ex

Browse Source
This commit is contained in:
DorfDork 2020-09-04 08:45:33 -05:00
parent 2d191d8c99
commit 39e77295fa
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/game/behaviors/snufit.inc.c
View File

@ -181,10 +181,9 @@ void bhv_snufit_balls_loop(void) {
// If far from Mario or in a different room, despawn. // If far from Mario or in a different room, despawn.
if ((o->activeFlags & ACTIVE_FLAG_IN_DIFFERENT_ROOM) if ((o->activeFlags & ACTIVE_FLAG_IN_DIFFERENT_ROOM)
#ifndef NODRAWINGDISTANCE #ifndef NODRAWINGDISTANCE
|| (o->oTimer != 0 && o->oDistanceToMario > 1500.0f)) { || (o->oTimer != 0 && o->oDistanceToMario > 1500.0f)
#else
|| (o->oTimer != 0)) {
#endif #endif
){
obj_mark_for_deletion(o); obj_mark_for_deletion(o);
} }

2
src/game/mario_actions_airborne.c
View File

@ -1754,7 +1754,7 @@ s32 act_flying(struct MarioState *m) {
set_camera_mode(m->area->camera, CAMERA_MODE_BEHIND_MARIO, 1); set_camera_mode(m->area->camera, CAMERA_MODE_BEHIND_MARIO, 1);
#else #else
if (newcam_active == 0) if (newcam_active == 0)
set_camera_mode(m->area->camera, m->area->camera->defMode, 1); set_camera_mode(m->area->camera, CAMERA_MODE_BEHIND_MARIO, 1);
else else
{ {
m->area->camera->mode = CAMERA_MODE_NEWCAM; m->area->camera->mode = CAMERA_MODE_NEWCAM;