small fixes

This commit is contained in:
dborth 2010-04-17 03:06:12 +00:00
parent e28588ef62
commit 67708f6301
2 changed files with 19 additions and 20 deletions

View File

@ -197,15 +197,14 @@ SetupPads()
}
}
#ifdef HW_RVL
/****************************************************************************
* ShutoffRumble
***************************************************************************/
void ShutoffRumble()
{
#ifdef HW_RVL
if(CONF_GetPadMotorMode() == 0)
return;
for(int i=0;i<4;i++)
{
WPAD_Rumble(i, 0);
@ -219,31 +218,29 @@ void ShutoffRumble()
/****************************************************************************
* DoRumble
***************************************************************************/
void DoRumble(int i)
{
if(!GCSettings.Rumble) return;
if(rumbleRequest[i])
#ifdef HW_RVL
if(CONF_GetPadMotorMode() == 0 || !GCSettings.Rumble) return;
if(rumbleRequest[i] && rumbleCount[i] < 3)
{
if(rumbleCount[i] < 3)
{
WPAD_Rumble(i, 1); // rumble on
++rumbleCount[i];
}
else
{
rumbleCount[i] = 12;
rumbleRequest[i] = 0;
}
WPAD_Rumble(i, 1); // rumble on
rumbleCount[i]++;
}
else if(rumbleRequest[i])
{
rumbleCount[i] = 12;
rumbleRequest[i] = 0;
}
else
{
if(rumbleCount[i])
--rumbleCount[i];
rumbleCount[i]--;
WPAD_Rumble(i, 0); // rumble off
}
}
#endif
}
static int SilenceNeeded = 0;

View File

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