The-Homebrew-Cloud/fceugx
2
0
Fork 0
mirror of https://github.com/dborth/fceugx.git synced 2025-01-10 07:39:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
dborth 2010-04-17 03:04:21 +00:00
parent a757356524
commit c11da59319
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/fceugx.cpp
View File

@ -152,11 +152,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

7
source/pad.cpp
View File

@ -256,6 +256,9 @@ SetupPads()
void ShutoffRumble() void ShutoffRumble()
{ {
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);
@ -270,7 +273,9 @@ void ShutoffRumble()
void DoRumble(int i) void DoRumble(int i)
{ {
if(!GCSettings.Rumble) return; if(CONF_GetPadMotorMode() == 0 || !GCSettings.Rumble)
return;
if(rumbleRequest[i] && rumbleCount[i] < 3) if(rumbleRequest[i] && rumbleCount[i] < 3)
{ {
WPAD_Rumble(i, 1); // rumble on WPAD_Rumble(i, 1); // rumble on