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

Merge pull request #2 from project64/master 

sync
This commit is contained in:
MELERIX 2015-03-01 16:05:16 -03:00
parent 7025af9dcb 3b0b1c60af
commit 6b971d1702
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Config/Project64.rdb
View File

@ -6104,6 +6104,7 @@ Self Texture=0
[FD6907F0-83CBC160-C:44]
Good Name=StarCraft 64 (G) (Beta)
Internal Name=STARCRAFT 64
Status=Compatible
Clear Frame=2
Culling=1
Emulate Clear=0

1
Source/Project64/3rd Party/7zip.h
View File

@ -26,7 +26,6 @@ public:
inline int NumFiles ( void ) const { return m_db ? m_db->db.NumFiles : 0; }
inline CSzFileItem * FileItem ( int index ) const { return m_db ? &m_db->db.Files[index] : NULL; }
//inline CSzFileItem * FileItem ( int index ) const { return m_db ? &m_db->db.Files[index] : NULL; }
inline int FileSize ( void ) const { return m_FileSize; }
inline bool OpenSuccess ( void) const { return m_Opened; }

8
Source/Project64/N64 System/N64 Rom Class.cpp
View File

@ -293,15 +293,14 @@ bool CN64Rom::LoadN64Image ( const char * FileLoc, bool LoadBootCodeOnly ) {
C7zip ZipFile(FullPath);
ZipFile.SetNotificationCallback((C7zip::LP7ZNOTIFICATION)NotificationCB,this);
#ifdef tofix
for (int i = 0; i < ZipFile.NumFiles(); i++)
{
CFileItem * f = ZipFile.FileItem(i);
if (f->IsDirectory)
CSzFileItem * f = ZipFile.FileItem(i);
if (f->IsDir)
{
continue;
}
if (_stricmp(f->Name, SubFile) != 0)
if (_stricmp(ZipFile.FileNameIndex(i).c_str(), SubFile) != 0)
{
continue;
}
@ -352,7 +351,6 @@ bool CN64Rom::LoadN64Image ( const char * FileLoc, bool LoadBootCodeOnly ) {
SetError(MSG_7Z_FILE_NOT_FOUND);
return false;
}
#endif
}
//Try to open the file as a zip file

2
Source/Project64/User Interface/Rom Browser Class.cpp
View File

@ -1341,7 +1341,7 @@ void CRomBrowser::RomList_GetDispInfo(DWORD pnmh) {
break;
default: strncpy(lpdi->item.pszText, " ", lpdi->item.cchTextMax);
}
if (strlen(lpdi->item.pszText) == 0) { strcpy(lpdi->item.pszText," "); }
if (lpdi->item.pszText == NULL || strlen(lpdi->item.pszText) == 0) { strcpy(lpdi->item.pszText, " "); }
}
void CRomBrowser::RomList_OpenRom(DWORD /*pnmh*/) {