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

A few more fixes

This commit is contained in:
Colton Rushton 2021-02-16 01:11:11 -04:00
parent 362865dfb2
commit 0b20818167
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/camera.c
View File

@ -6894,7 +6894,7 @@ s32 rotate_camera_around_walls(struct Camera *c, Vec3f cPos, s16 *avoidYaw, s16
colData.y = sMarioCamState->pos[1] + ((cPos[1] - sMarioCamState->pos[1]) * checkDist);
colData.z = sMarioCamState->pos[2] + ((cPos[2] - sMarioCamState->pos[2]) * checkDist);
colData.radius = coarseRadius;
// Increase the coarse check
// Increase the coarse check radius
#ifndef QOL_FIXES
camera_approach_f32_symmetric_bool(&coarseRadius, 250.f, 30.f);
#else

4
src/game/mario_actions_cutscene.c
View File

@ -603,11 +603,7 @@ void general_star_dance_handler(struct MarioState *m, s32 isInWater) {
if (m->actionState == 0) {
switch (++m->actionTimer) {
case 1:
#ifdef QOL_FIXES
spawn_object(m->marioObj, MODEL_NONE, bhvCelebrationStar)->header.gfx.sharedChild = m->interactObj->header.gfx.sharedChild;
#else
spawn_object(m->marioObj, MODEL_STAR, bhvCelebrationStar);
#endif
disable_background_sound();
if (m->actionArg & 1) {
play_course_clear();

4
src/game/object_helpers.c
View File

@ -1751,8 +1751,12 @@ static void cur_obj_update_floor(void) {
o->oMoveFlags |= OBJ_MOVE_ABOVE_LAVA;
}
#if !defined(VERSION_JP) || defined(QOL_FIXES)
#ifndef QOL_FIXES
else if (floor->type == SURFACE_DEATH_PLANE) {
//! This misses SURFACE_VERTICAL_WIND (and maybe SURFACE_WARP)
#else
else if (floor->type == SURFACE_DEATH_PLANE || floor->type == SURFACE_VERTICAL_WIND || SURFACE_WARP) {
#endif
o->oMoveFlags |= OBJ_MOVE_ABOVE_DEATH_BARRIER;
}
#endif