The-Homebrew-Cloud/vbagx
2
0
Fork 0
mirror of https://github.com/dborth/vbagx.git synced 2024-12-28 03:31:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

small fixes

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/input.cpp
View File

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

6
source/vbagx.cpp
View File

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