ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Project64] Code clean up RomList.cpp

This commit is contained in:
zilmar 2016-08-07 16:57:31 +10:00
parent dff58bbbad
commit bb3d895934
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Source/Project64-core/RomList/RomList.cpp
View File

@ -24,13 +24,13 @@ static const char* ROM_extensions[] =
#endif #endif
"zip", "zip",
"v64", "v64",
"z64", "z64",
"n64", "n64",
"rom", "rom",
"jap", "jap",
"pal", "pal",
"usa", "usa",
"eur", "eur",
"bin", "bin",
}; };
@ -125,7 +125,7 @@ void CRomList::RefreshRomListThread(void)
void CRomList::AddRomToList(const char * RomLocation) void CRomList::AddRomToList(const char * RomLocation)
{ {
WriteTrace(TraceRomList, TraceVerbose, "Start (RomLocation: \"%s\")",RomLocation); WriteTrace(TraceRomList, TraceVerbose, "Start (RomLocation: \"%s\")", RomLocation);
ROM_INFO RomInfo = { 0 }; ROM_INFO RomInfo = { 0 };
strncpy(RomInfo.szFullFileName, RomLocation, (sizeof(RomInfo.szFullFileName) / sizeof(RomInfo.szFullFileName[0])) - 1); strncpy(RomInfo.szFullFileName, RomLocation, (sizeof(RomInfo.szFullFileName) / sizeof(RomInfo.szFullFileName[0])) - 1);
@ -144,7 +144,7 @@ void CRomList::AddRomToList(const char * RomLocation)
void CRomList::FillRomList(strlist & FileList, const char * Directory) void CRomList::FillRomList(strlist & FileList, const char * Directory)
{ {
WriteTrace(TraceRomList, TraceDebug, "Start (m_GameDir = %s, Directory: %s)",(const char *)m_GameDir,Directory); WriteTrace(TraceRomList, TraceDebug, "Start (m_GameDir = %s, Directory: %s)", (const char *)m_GameDir, Directory);
CPath SearchPath((const char *)m_GameDir, "*"); CPath SearchPath((const char *)m_GameDir, "*");
SearchPath.AppendDirectory(Directory); SearchPath.AppendDirectory(Directory);
@ -152,7 +152,7 @@ void CRomList::FillRomList(strlist & FileList, const char * Directory)
if (!SearchPath.FindFirst(CPath::FIND_ATTRIBUTE_ALLFILES)) if (!SearchPath.FindFirst(CPath::FIND_ATTRIBUTE_ALLFILES))
{ {
WriteTrace(TraceRomList, TraceVerbose, "No files found"); WriteTrace(TraceRomList, TraceVerbose, "No files found");
WriteTrace(TraceRomList, TraceDebug, "Done (Directory: %s)",Directory); WriteTrace(TraceRomList, TraceDebug, "Done (Directory: %s)", Directory);
return; return;
} }
@ -162,7 +162,7 @@ void CRomList::FillRomList(strlist & FileList, const char * Directory)
if (m_StopRefresh) if (m_StopRefresh)
{ {
WriteTrace(TraceRomList, TraceVerbose, "stop refresh set, stopping"); WriteTrace(TraceRomList, TraceVerbose, "stop refresh set, stopping");
break; break;
} }
if (SearchPath.IsDirectory()) if (SearchPath.IsDirectory())
@ -323,7 +323,7 @@ void CRomList::FillRomList(strlist & FileList, const char * Directory)
#ifdef _WIN32 #ifdef _WIN32
m_ZipIniFile->FlushChanges(); m_ZipIniFile->FlushChanges();
#endif #endif
WriteTrace(TraceRomList, TraceDebug, "Done (Directory: %s)",Directory); WriteTrace(TraceRomList, TraceDebug, "Done (Directory: %s)", Directory);
} }
void CRomList::NotificationCB(const char * Status, CRomList * /*_this*/) void CRomList::NotificationCB(const char * Status, CRomList * /*_this*/)
@ -405,16 +405,16 @@ bool CRomList::LoadDataFromRomFile(const char * FileName, uint8_t * Data, int32_
return false; return false;
} }
File.SeekToBegin(); File.SeekToBegin();
if (!File.Read(Test,sizeof(Test))) if (!File.Read(Test, sizeof(Test)))
{ {
return false; return false;
} }
if (!CN64Rom::IsValidRomImage(Test)) if (!CN64Rom::IsValidRomImage(Test))
{ {
return false; return false;
} }
File.SeekToBegin(); File.SeekToBegin();
if (!File.Read(Data,DataLen)) if (!File.Read(Data, DataLen))
{ {
return false; return false;
} }
@ -551,6 +551,7 @@ void CRomList::ByteSwapRomData(uint8_t * Data, int32_t DataLen)
void CRomList::LoadRomList(void) void CRomList::LoadRomList(void)
{ {
WriteTrace(TraceRomList, TraceVerbose, "Start");
CPath FileName(g_Settings->LoadStringVal(RomList_RomListCache)); CPath FileName(g_Settings->LoadStringVal(RomList_RomListCache));
CFile file(FileName, CFileBase::modeRead | CFileBase::modeNoTruncate); CFile file(FileName, CFileBase::modeRead | CFileBase::modeNoTruncate);
@ -593,6 +594,7 @@ void CRomList::LoadRomList(void)
RomAddedToList(ListPos); RomAddedToList(ListPos);
} }
RomListLoaded(); RomListLoaded();
WriteTrace(TraceRomList, TraceVerbose, "Done");
} }
/* /*