small fixes

This commit is contained in:
dborth 2010-04-17 03:05:03 +00:00
parent d7b709ca0b
commit 19a691e68d
2 changed files with 9 additions and 3 deletions

View File

@ -266,6 +266,9 @@ SetupPads()
***************************************************************************/
void ShutoffRumble()
{
if(CONF_GetPadMotorMode() == 0)
return;
for(int i=0;i<4;i++)
{
WPAD_Rumble(i, 0);
@ -279,7 +282,8 @@ void ShutoffRumble()
***************************************************************************/
void DoRumble(int i)
{
if(!GCSettings.Rumble) return;
if(CONF_GetPadMotorMode() == 0 || !GCSettings.Rumble) return;
if(rumbleRequest[i] && rumbleCount[i] < 3)
{
WPAD_Rumble(i, 1); // rumble on

View File

@ -145,11 +145,13 @@ void ExitApp()
#ifdef HW_RVL
void ShutdownCB()
{
ShutdownRequested = 1;
if(!inNetworkInit)
ShutdownRequested = 1;
}
void ResetCB()
{
ResetRequested = 1;
if(!inNetworkInit)
ResetRequested = 1;
}
#endif