Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-27 07:20:49 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #533 from lioncash/master

Browse Source 
outtextlimit and outtextlength should be unsigned.
This commit is contained in:
Henrik Rydgård 2013-01-29 13:12:09 -08:00
commit a766ec42d8
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Core/Dialog/PSPOskDialog.cpp
View File

@ -102,7 +102,7 @@ void PSPOskDialog::RenderKeyboard()
char temp[2];
temp[1] = '\0';
int limit = oskData.outtextlimit;
u32 limit = oskData.outtextlimit;
// TODO: Test more thoroughly. Encountered a game where this was 0.
if (limit <= 0)
limit = 16;
@ -112,10 +112,10 @@ void PSPOskDialog::RenderKeyboard()
float title = (480.0f - (7.0f * limit)) / 2.0f;
PPGeDrawText(oskDesc.c_str(), title , 20, PPGE_ALIGN_CENTER, 0.5f, CalcFadedColor(0xFFFFFFFF));
for (int i = 0; i < limit; ++i)
for (u32 i = 0; i < limit; ++i)
{
u32 color = CalcFadedColor(0xFFFFFFFF);
if (i < (int) inputChars.size())
if (i < inputChars.size())
temp[0] = inputChars[i];
else if (i == inputChars.size())
{
@ -151,7 +151,7 @@ int PSPOskDialog::Update()
int selectedRow = selectedChar / KEYSPERROW;
int selectedExtra = selectedChar % KEYSPERROW;
int limit = oskData.outtextlimit;
u32 limit = oskData.outtextlimit;
// TODO: Test more thoroughly. Encountered a game where this was 0.
if (limit <= 0)
limit = 16;
@ -201,7 +201,7 @@ int PSPOskDialog::Update()
if (IsButtonPressed(CTRL_CROSS))
{
if ((int) inputChars.size() < limit)
if (inputChars.size() < limit)
inputChars += oskKeys[selectedRow][selectedExtra];
}
else if (IsButtonPressed(CTRL_CIRCLE))
@ -220,15 +220,15 @@ int PSPOskDialog::Update()
status = SCE_UTILITY_STATUS_SHUTDOWN;
}
for (int i = 0; i < limit; ++i)
for (u32 i = 0; i < limit; ++i)
{
u16 value = 0;
if (i < (int) inputChars.size())
if (i < inputChars.size())
value = 0x0000 ^ inputChars[i];
Memory::Write_U16(value, oskData.outtextPtr + (2 * i));
}
oskData.outtextlength = (int) inputChars.size();
oskData.outtextlength = inputChars.size();
oskParams.base.result= 0;
oskData.result = PSP_UTILITY_OSK_RESULT_CHANGED;
Memory::WriteStruct(oskParams.SceUtilityOskDataPtr, &oskData);

4
Core/Dialog/PSPOskDialog.h
View File

@ -115,13 +115,13 @@ typedef struct _SceUtilityOskData
/** Initial text */
u32 intextPtr;
/** Length of output text */
int outtextlength;
u32 outtextlength;
/** Pointer to the output text */
u32 outtextPtr;
/** Result. One of ::SceUtilityOskResult */
int result;
/** The max text that can be input */
int outtextlimit;
u32 outtextlimit;
} SceUtilityOskData;