From 8b3068536f8e2eb20a09c269709aaf33065b1977 Mon Sep 17 00:00:00 2001
From: dborth <dborth@ab33defa-829a-11dd-99d6-6900107db72b>
Date: Mon, 15 Mar 2010 23:44:32 +0000
Subject: [PATCH] rumble off option now completely disables rumble

---
 source/ngc/input.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/source/ngc/input.cpp b/source/ngc/input.cpp
index 5837dc2..2c31541 100644
--- a/source/ngc/input.cpp
+++ b/source/ngc/input.cpp
@@ -233,6 +233,8 @@ static int SilenceNeeded = 0;
 
 static void updateRumble()
 {
+	if(!GCSettings.Rumble) return;
+
 	bool r = false;
 	if (ConfigRequested) r = (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);
 }
 
-void updateRumbleFrame() {
+void updateRumbleFrame()
+{
+	if(!GCSettings.Rumble) return;
+
 	// If we already rumbled continuously for more than 50 frames,
 	// then disable rumbling for a while.
 	if (rumbleCountAlready > 70) {