Fixes from Ex

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

View File

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

View File

@ -1754,7 +1754,7 @@ s32 act_flying(struct MarioState *m) {
set_camera_mode(m->area->camera, CAMERA_MODE_BEHIND_MARIO, 1);
#else
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
{
m->area->camera->mode = CAMERA_MODE_NEWCAM;