diff options
Diffstat (limited to 'soh/src/code')
| -rw-r--r-- | soh/src/code/padmgr.c | 2 | ||||
| -rw-r--r-- | soh/src/code/z_camera.c | 2 | ||||
| -rw-r--r-- | soh/src/code/z_fbdemo_wipe1.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/soh/src/code/padmgr.c b/soh/src/code/padmgr.c index d89207e6f..9bd9d53e7 100644 --- a/soh/src/code/padmgr.c +++ b/soh/src/code/padmgr.c @@ -269,7 +269,7 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) { input->press.stick_y += (s8)(input->cur.stick_y - input->prev.stick_y); } - controllerCallback.rumble = CVar_GetS32("gRumbleEnabled", 0) && (padMgr->rumbleEnable[0] > 0); + controllerCallback.rumble = (padMgr->rumbleEnable[0] > 0); if (HealthMeter_IsCritical()) { controllerCallback.ledColor = 0; diff --git a/soh/src/code/z_camera.c b/soh/src/code/z_camera.c index 704062b1b..287edeb60 100644 --- a/soh/src/code/z_camera.c +++ b/soh/src/code/z_camera.c @@ -1481,7 +1481,7 @@ s32 Camera_Free(Camera* camera) { camBgChk.pos = camera->eye; - float maxRadius = 160.0f; + float maxRadius = 150.0f; if (Camera_BGCheckInfo(camera, &at, &camBgChk)) { VecSph collSphere; OLib_Vec3fDiffToVecSphGeo(&collSphere, &at, &camBgChk.pos); diff --git a/soh/src/code/z_fbdemo_wipe1.c b/soh/src/code/z_fbdemo_wipe1.c index 1dfb0a501..d4502f8e7 100644 --- a/soh/src/code/z_fbdemo_wipe1.c +++ b/soh/src/code/z_fbdemo_wipe1.c @@ -89,6 +89,7 @@ void TransitionWipe_Draw(void* thisx, Gfx** gfxP) { TransitionWipe* this = (TransitionWipe*)thisx; s32 pad[4]; Gfx* tex; + Gfx* wipeDl = sWipeDList; modelView = this->modelView[this->frame]; |