The-Homebrew-Cloud/vbagx
2
0
Fork 0
mirror of https://github.com/dborth/vbagx.git synced 2024-11-29 05:54:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

rumble off option now completely disables rumble

Browse Source
This commit is contained in:
dborth 2010-03-15 23:44:32 +00:00
parent a1f87f307b
commit 8b3068536f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/ngc/input.cpp
View File

@ -233,6 +233,8 @@ static int SilenceNeeded = 0;
static void updateRumble() static void updateRumble()
{ {
if(!GCSettings.Rumble) return;
bool r = false; bool r = false;
if (ConfigRequested) r = (menuRumbleCount > 0); if (ConfigRequested) r = (menuRumbleCount > 0);
else r = cartridgeRumble || possibleCartridgeRumble || (gameRumbleCount > 0) || (menuRumbleCount > 0); else r = cartridgeRumble || possibleCartridgeRumble || (gameRumbleCount > 0) || (menuRumbleCount > 0);
@ -258,7 +260,10 @@ static void updateRumble()
PAD_ControlMotor(PAD_CHAN0, r?PAD_MOTOR_RUMBLE:PAD_MOTOR_STOP); PAD_ControlMotor(PAD_CHAN0, r?PAD_MOTOR_RUMBLE:PAD_MOTOR_STOP);
} }
void updateRumbleFrame() { void updateRumbleFrame()
{
if(!GCSettings.Rumble) return;
// If we already rumbled continuously for more than 50 frames, // If we already rumbled continuously for more than 50 frames,
// then disable rumbling for a while. // then disable rumbling for a while.
if (rumbleCountAlready > 70) { if (rumbleCountAlready > 70) {