preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-14 18:19:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4296 from xsacha/master

Browse Source 
Use correct count in save data focus compares. Also fix the random data that caused the issue. Also fix time compares.
This commit is contained in:
Henrik Rydgård committed 2013-10-23 06:43:14 -07:00
2 parents cb0211f5a3 9e20e1a297
commit 68ba188dcd
2 files changed
+22 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Core/Dialog/SavedataParam.cpp
+13 -9
View File
@@ -1294,17 +1294,19 @@ int SavedataParam::GetFirstListSave()
int SavedataParam::GetLastListSave()
{
return saveDataListCount - 1;
return saveNameListDataCount - 1;
}
int SavedataParam::GetLatestSave()
{
int idx = 0;
time_t idxTime = 0;
for (int i = 0; i < saveDataListCount; ++i)
for (int i = 0; i < saveNameListDataCount; ++i)
{
if (saveDataList[i].size == 0)
continue;
time_t thisTime = mktime(&saveDataList[i].modif_time);
if (idxTime < thisTime)
if ((s64)idxTime < (s64)thisTime)
{
idx = i;
idxTime = thisTime;
@@ -1317,10 +1319,12 @@ int SavedataParam::GetOldestSave()
{
int idx = 0;
time_t idxTime = 0;
for (int i = 0; i < saveDataListCount; ++i)
for (int i = 0; i < saveNameListDataCount; ++i)
{
if (saveDataList[i].size == 0)
continue;
time_t thisTime = mktime(&saveDataList[i].modif_time);
if (idxTime > thisTime)
if ((s64)idxTime > (s64)thisTime)
{
idx = i;
idxTime = thisTime;
@@ -1332,7 +1336,7 @@ int SavedataParam::GetOldestSave()
int SavedataParam::GetFirstDataSave()
{
int idx = 0;
for (int i = 0; i < saveDataListCount; ++i)
for (int i = 0; i < saveNameListDataCount; ++i)
{
if (saveDataList[i].size != 0)
{
@@ -1346,7 +1350,7 @@ int SavedataParam::GetFirstDataSave()
int SavedataParam::GetLastDataSave()
{
int idx = 0;
for (int i = saveDataListCount; i > 0; )
for (int i = saveNameListDataCount; i > 0; )
{
--i;
if (saveDataList[i].size != 0)
@@ -1361,7 +1365,7 @@ int SavedataParam::GetLastDataSave()
int SavedataParam::GetFirstEmptySave()
{
int idx = 0;
for (int i = 0; i < saveDataListCount; ++i)
for (int i = 0; i < saveNameListDataCount; ++i)
{
if (saveDataList[i].size == 0)
{
@@ -1375,7 +1379,7 @@ int SavedataParam::GetFirstEmptySave()
int SavedataParam::GetLastEmptySave()
{
int idx = 0;
for (int i = saveDataListCount; i > 0; )
for (int i = saveNameListDataCount; i > 0; )
{
--i;
if (saveDataList[i].size == 0)
Core/Dialog/SavedataParam.h
+9
View File
@@ -254,6 +254,15 @@ struct SaveFileInfo
int textureWidth;
int textureHeight;
SaveFileInfo() : size(0), saveName(""), idx(0),
textureData(0), textureWidth(0), textureHeight(0)
{
memset(title, 0, 128);
memset(saveTitle, 0, 128);
memset(saveDetail, 0, 1024);
modif_time = {0};
}
void DoState(PointerWrap &p)
{
auto s = p.Section("SaveFileInfo", 1);