Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Always use iButtonPreference, fixes #2390.

Browse source
This commit is contained in:
Unknown W. Brackets 2013-06-21 17:45:39 -07:00
parent 2438259c8a
commit 8fe9620350
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Core/Config.h
View file

@ -119,7 +119,6 @@ public:
int iDateFormat;
int iTimeZone;
bool bDayLightSavings;
bool bButtonPreference;
int iButtonPreference;
int iLockParentalLevel;
bool bEncryptSave;

7
Core/Dialog/PSPOskDialog.cpp
View file

@ -21,6 +21,7 @@
#include "Core/Dialog/PSPOskDialog.h"
#include "Core/Util/PPGeDraw.h"
#include "Core/HLE/sceCtrl.h"
#include "Core/HLE/sceUtility.h"
#include "Core/Config.h"
#include "Core/Reporting.h"
#include "Common/ChunkFile.h"
@ -750,7 +751,7 @@ int PSPOskDialog::Update()
StartDraw();
PPGeDrawRect(0, 0, 480, 272, CalcFadedColor(0x63636363));
RenderKeyboard();
if (g_Config.bButtonPreference)
if (g_Config.iButtonPreference != PSP_SYSTEMPARAM_BUTTON_CIRCLE)
{
PPGeDrawImage(I_CROSS, 30, 220, 20, 20, 0, CalcFadedColor(0xFFFFFFFF));
PPGeDrawImage(I_CIRCLE, 150, 220, 20, 20, 0, CalcFadedColor(0xFFFFFFFF));
@ -795,7 +796,7 @@ int PSPOskDialog::Update()
selectedChar = (selectedChar + (numKeyCols[currentKeyboard] * numKeyRows[currentKeyboard])) % (numKeyCols[currentKeyboard] * numKeyRows[currentKeyboard]);
if ((IsButtonPressed(CTRL_CROSS) && g_Config.bButtonPreference) || (IsButtonPressed(CTRL_CIRCLE) && !g_Config.bButtonPreference))
if (IsButtonPressed(g_Config.iButtonPreference != PSP_SYSTEMPARAM_BUTTON_CIRCLE ? CTRL_CROSS : CTRL_CIRCLE))
{
inputChars = CombinationString(true);
}
@ -816,7 +817,7 @@ int PSPOskDialog::Update()
selectedChar = selectedRow * numKeyCols[currentKeyboard] + selectedExtra;
}
else if ((IsButtonPressed(CTRL_CIRCLE) && g_Config.bButtonPreference) || (IsButtonPressed(CTRL_CROSS) && !g_Config.bButtonPreference))
else if (IsButtonPressed(g_Config.iButtonPreference != PSP_SYSTEMPARAM_BUTTON_CIRCLE ? CTRL_CROSS : CTRL_CIRCLE))
{
if (inputChars.size() > 0)
{

2
Core/HLE/sceImpose.cpp
View file

@ -37,7 +37,7 @@ static u32 backlightOffTime;
void __ImposeInit()
{
language = g_Config.ilanguage;
buttonValue = g_Config.bButtonPreference?PSP_SYSTEMPARAM_BUTTON_CROSS:PSP_SYSTEMPARAM_BUTTON_CIRCLE;
buttonValue = g_Config.iButtonPreference;
umdPopup = PSP_UMD_POPUP_DISABLE;
backlightOffTime = 0;
}