add option to disable rumble, auto-determine if HBC stub is present

readme.txt

@@ -220,8 +220,7 @@ Gamecube:
 ---------
 You can load FCEUGX via sdload and an SD card in slot A, or by streaming 
 it to your Gamecube, or by booting a bootable DVD with FCEUGX on it. 
-This document doesn't cover how to do any of that. A good source for information 
+This document doesn't cover how to do any of that.
-on these topics is the tehskeen forums: http://www.tehskeen.com/forums/
 
 ----------------------------
 ROMS, Preferences, and Saves:
@@ -303,8 +302,5 @@ Timing - NTSC or PAL (Depends if you're running a PAL or NTSC game)
  
                                   FCEUGX Web Site
                           http://code.google.com/p/fceugc
-                              
-                              TehSkeen Support Forums
-                              http://www.tehskeen.net
  
 ¸,ø¤°`°¤ø,¸¸,ø¤°`°¤ø,¸,ø¤°`°¤ø,¸¸,ø¤°`°¤ø,¸,ø¤°`°¤ø,¸¸,ø¤°`°¤ø,¸,ø¤°`°¤ø,¸¸,ø¤

source/ngc/fceuconfig.cpp

@@ -77,6 +77,7 @@ DefaultSettings ()
 	GCSettings.ExitAction = 0;
 	GCSettings.MusicVolume = 40;
 	GCSettings.SFXVolume = 40;
+	GCSettings.Rumble = 1;
 
 	GCSettings.LoadMethod = METHOD_AUTO; // Auto, SD, DVD, USB, Network (SMB)
 	GCSettings.SaveMethod = METHOD_AUTO; // Auto, SD, Memory Card Slot A, Memory Card Slot B, USB, Network (SMB)

source/ngc/fceugx.cpp

@@ -96,16 +96,26 @@ void ExitApp()
 {
 	ExitCleanup();
 
-	if(GCSettings.ExitAction == 0) // Exit to Loader
+	#ifdef HW_RVL
+	if(GCSettings.ExitAction == 0) // Auto
 	{
-		#ifdef HW_RVL
+		char * sig = (char *)0x80001804;
-			exit(0);
+		if(
-		#else
+			sig[0] == 'S' &&
-			if (psoid[0] == PSOSDLOADID)
+			sig[1] == 'T' &&
-				PSOReload ();
+			sig[2] == 'U' &&
-		#endif
+			sig[3] == 'B' &&
+			sig[4] == 'H' &&
+			sig[5] == 'A' &&
+			sig[6] == 'X' &&
+			sig[7] == 'X')
+			GCSettings.ExitAction = 3; // Exit to HBC
+		else
+			GCSettings.ExitAction = 1; // HBC not found
 	}
-	else if(GCSettings.ExitAction == 1) // Exit to Menu
+	#endif
+
+	if(GCSettings.ExitAction == 1) // Exit to Menu
 	{
 		#ifdef HW_RVL
 			SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);
@@ -114,10 +124,19 @@ void ExitApp()
 			*SOFTRESET_ADR = 0x00000000;
 		#endif
 	}
-	else // Shutdown Wii
+	else if(GCSettings.ExitAction == 2) // Shutdown Wii
 	{
 		SYS_ResetSystem(SYS_POWEROFF, 0, 0);
 	}
+	else // Exit to Loader
+	{
+		#ifdef HW_RVL
+			exit(0);
+		#else
+			if (psoid[0] == PSOSDLOADID)
+				PSOReload();
+		#endif
+	}
 }
 
 #ifdef HW_RVL

source/ngc/fceugx.h

@@ -83,6 +83,7 @@ struct SGCSettings{
 	int		ExitAction;
 	int		MusicVolume;
 	int		SFXVolume;
+	int		Rumble;
 };
 
 void ExitApp();

source/ngc/menu.cpp

@@ -3289,6 +3289,7 @@ static int MenuSettingsMenu()
 	sprintf(options.name[i++], "Wiimote Orientation");
 	sprintf(options.name[i++], "Music Volume");
 	sprintf(options.name[i++], "Sound Effects Volume");
+	sprintf(options.name[i++], "Rumble");
 	options.length = i;
 
 	GuiText titleTxt("Settings - Menu", 28, (GXColor){255, 255, 255, 255});
@@ -3341,13 +3342,10 @@ static int MenuSettingsMenu()
 			sprintf (options.value[0], "Return to Wii Menu");
 		else if (GCSettings.ExitAction == 2)
 			sprintf (options.value[0], "Power off Wii");
-		else
+		else if (GCSettings.ExitAction == 3)
 			sprintf (options.value[0], "Return to Loader");
-
+		else
-		if (GCSettings.WiimoteOrientation == 0)
+			sprintf (options.value[0], "Auto");
-			sprintf (options.value[1], "Vertical");
-		else if (GCSettings.WiimoteOrientation == 1)
-			sprintf (options.value[1], "Horizontal");
 		#else // GameCube
 		if(GCSettings.ExitAction > 1)
 			GCSettings.ExitAction = 0;
@@ -3359,8 +3357,14 @@ static int MenuSettingsMenu()
 		options.name[1][0] = 0; // Wiimote
 		options.name[2][0] = 0; // Music
 		options.name[3][0] = 0; // Sound Effects
+		options.name[4][0] = 0; // Rumble
 		#endif
 
+		if (GCSettings.WiimoteOrientation == 0)
+			sprintf (options.value[1], "Vertical");
+		else if (GCSettings.WiimoteOrientation == 1)
+			sprintf (options.value[1], "Horizontal");
+
 		if(GCSettings.MusicVolume > 0)
 			sprintf(options.value[2], "%d%%", GCSettings.MusicVolume);
 		else
@@ -3371,13 +3375,18 @@ static int MenuSettingsMenu()
 		else
 			sprintf(options.value[3], "Mute");
 
+		if (GCSettings.Rumble == 1)
+			sprintf (options.value[4], "Enabled");
+		else
+			sprintf (options.value[4], "Disabled");
+
 		ret = optionBrowser.GetClickedOption();
 
 		switch (ret)
 		{
 			case 0:
 				GCSettings.ExitAction++;
-				if(GCSettings.ExitAction > 2)
+				if(GCSettings.ExitAction > 3)
 					GCSettings.ExitAction = 0;
 				break;
 			case 1:
@@ -3394,6 +3403,9 @@ static int MenuSettingsMenu()
 				if(GCSettings.SFXVolume > 100)
 					GCSettings.SFXVolume = 0;
 				break;
+			case 4:
+				GCSettings.Rumble ^= 1;
+				break;
 		}
 
 		if(backBtn.GetState() == STATE_CLICKED)

source/ngc/pad.cpp

@@ -189,6 +189,7 @@ void ShutoffRumble()
 
 void DoRumble(int i)
 {
+	if(!GCSettings.Rumble) return;
 	if(rumbleRequest[i] && rumbleCount[i] < 3)
 	{
 		WPAD_Rumble(i, 1); // rumble on