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

Merge branch 'master' into armjit

Browse source
This commit is contained in:
Henrik Rydgård 2013-01-15 22:41:02 +01:00
commit 2f758d515b
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Core/Dialog/PSPSaveDialog.cpp
View file

@ -163,14 +163,14 @@ void PSPSaveDialog::DisplaySaveList(bool canMove)
{
w = 80;
h = 40;
x = 50;
x = 55;
}
float y = 80;
float y = 95;
if(displayCount < currentSelectedSave)
y -= 50 * (currentSelectedSave - displayCount);
y -= 10 + 40 * (currentSelectedSave - displayCount );
else if(displayCount > currentSelectedSave)
{
y += 90 + 50 * (displayCount - currentSelectedSave - 1);
y += 90 + 40 * (displayCount - currentSelectedSave - 1);
}
int tw = 256;
@ -262,15 +262,15 @@ void PSPSaveDialog::DisplaySaveDataInfo1()
snprintf(saveTitle,512,"%s", param.GetFileInfo(currentSelectedSave).saveTitle);
snprintf(saveDetail,512,"%s", param.GetFileInfo(currentSelectedSave).saveDetail);
PPGeDrawRect(180, 118, 980, 119, 0xFFFFFFFF);
PPGeDrawRect(180, 128, 980, 129, 0xFFFFFFFF);
std::string titleTxt = title;
PPGeDrawText(titleTxt.c_str(), 180, 100, PPGE_ALIGN_LEFT, 0.5f, 0xFFC0C0C0);
PPGeDrawText(titleTxt.c_str(), 180, 110, PPGE_ALIGN_LEFT, 0.5f, 0xFFC0C0C0);
std::string timeTxt = time;
PPGeDrawText(timeTxt.c_str(), 180, 120, PPGE_ALIGN_LEFT, 0.45f, 0xFFFFFFFF);
PPGeDrawText(timeTxt.c_str(), 180, 130, PPGE_ALIGN_LEFT, 0.45f, 0xFFFFFFFF);
std::string saveTitleTxt = saveTitle;
PPGeDrawText(saveTitleTxt.c_str(), 180, 145, PPGE_ALIGN_LEFT, 0.45f, 0xFFFFFFFF);
PPGeDrawText(saveTitleTxt.c_str(), 180, 160, PPGE_ALIGN_LEFT, 0.45f, 0xFFFFFFFF);
std::string saveDetailTxt = saveDetail;
PPGeDrawText(saveDetailTxt.c_str(), 180, 170, PPGE_ALIGN_LEFT, 0.45f, 0xFFFFFFFF);
PPGeDrawText(saveDetailTxt.c_str(), 180, 180, PPGE_ALIGN_LEFT, 0.45f, 0xFFFFFFFF);
}
}
@ -325,10 +325,10 @@ void PSPSaveDialog::DisplayTitle(std::string name)
}
void PSPSaveDialog::DisplayEnterBack()
{
PPGeDrawImage(cancelButtonImg, 180, 240, 20, 20, 0, 0xFFFFFFFF);
PPGeDrawText("Back", 210, 240, PPGE_ALIGN_LEFT, 0.45f, 0xFFFFFFFF);
PPGeDrawImage(okButtonImg, 270, 240, 20, 20, 0, 0xFFFFFFFF);
PPGeDrawText("Enter", 300, 240, PPGE_ALIGN_LEFT, 0.45f, 0xFFFFFFFF);
PPGeDrawImage(cancelButtonImg, 180, 250, 20, 20, 0, 0xFFFFFFFF);
PPGeDrawText("Back", 210, 250, PPGE_ALIGN_LEFT, 0.45f, 0xFFFFFFFF);
PPGeDrawImage(okButtonImg, 270, 250, 20, 20, 0, 0xFFFFFFFF);
PPGeDrawText("Enter", 300, 250, PPGE_ALIGN_LEFT, 0.45f, 0xFFFFFFFF);
}
void PSPSaveDialog::DisplayBack()
{

3
GPU/GLES/TransformPipeline.cpp
View file

@ -332,7 +332,8 @@ static void SwapUVs(TransformedVertex &a, TransformedVertex &b) {
// Used by Star Soldier and Ys vs Sora.
static void RotateUVs(TransformedVertex v[4]) {
if ((v[0].x > v[2].x && v[0].y < v[2].y) /*|| (v[0].x < v[2].x && v[0].y > v[2].y)*/) {
if (/* (v[0].x > v[2].x && v[0].y < v[2].y) || */ // This first check seems wrong..
(v[0].x < v[2].x && v[0].y > v[2].y)) {
SwapUVs(v[1], v[3]);
}
}