vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Camera fix from sm64ex

This commit is contained in:
NoHomoBoi 2020-09-12 21:08:51 -05:00
parent ccce45a3f0
commit c59074ae15
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,12 +179,7 @@ void bhv_snufit_loop(void) {
*/
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)) {
#endif
if ((o->activeFlags & ACTIVE_FLAG_IN_DIFFERENT_ROOM) || (o->oTimer != 0 && o->oDistanceToMario > 1500.0f)) {
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);
#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;