fix gamecube home trigger bug

This commit is contained in:
dborth 2009-04-14 03:20:45 +00:00
parent fbfc422d35
commit d1fc2d085a
2 changed files with 7 additions and 3 deletions

View File

@ -577,7 +577,11 @@ void NGCReportButtons ()
{
if (
(userInput[i].pad.substickX < -70) ||
(userInput[i].pad.btns_h & (PAD_TRIGGER_L | PAD_TRIGGER_R | PAD_BUTTON_X | PAD_BUTTON_Y)) ||
(userInput[i].pad.btns_h & PAD_TRIGGER_L &&
userInput[i].pad.btns_h & PAD_TRIGGER_R &&
userInput[i].pad.btns_h & PAD_BUTTON_X &&
userInput[i].pad.btns_h & PAD_BUTTON_Y
) ||
(userInput[i].wpad.btns_d & WPAD_BUTTON_HOME) ||
(userInput[i].wpad.btns_d & WPAD_CLASSIC_BUTTON_HOME)
)

View File

@ -272,8 +272,8 @@ decodePrefsData (int method)
verMinor >= 0 && verMinor <= 9 &&
verPoint >= 0 && verPoint <= 9))
result = false;
else if(verPoint < 8 && verMajor == 1) // less than version 1.0.8
result = false; // reset settings (sorry, should update settings instead)
else if(verMajor < 4) // less than version 4.0.0
result = false; // reset settings
else if(verMajor > curMajor || verMinor > curMinor || verPoint > curPoint) // some future version
result = false; // reset settings
else