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

Project64: Provide ability for alternate identifier game settings

This commit is contained in:
zilmar 2020-10-22 12:37:09 +10:30
parent 7e503dc192
commit 373df2a912
4 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Config/Project64.rdb
View File

@ -5872,6 +5872,9 @@ SMM-TLB=0
Self Texture=1 Self Texture=1
RDRAM Size=8 RDRAM Size=8
[THE LEGEND OF ZELDA-C:45]
Alt Identifier=EC7011B7-7616D72B-C:45
[EC7011B7-7616D72B-C:45] [EC7011B7-7616D72B-C:45]
Good Name=The Legend of Zelda - Ocarina of Time (U) (V1.0) Good Name=The Legend of Zelda - Ocarina of Time (U) (V1.0)
Internal Name=THE LEGEND OF ZELDA Internal Name=THE LEGEND OF ZELDA

20
Source/Project64-core/N64System/N64RomClass.cpp
View File

@ -16,6 +16,7 @@
#include <Common/Platform.h> #include <Common/Platform.h>
#include <Common/MemoryManagement.h> #include <Common/MemoryManagement.h>
#include <Common/SmartPointer.h> #include <Common/SmartPointer.h>
#include <Common/IniFileClass.h>
#include <memory> #include <memory>
#ifdef _WIN32 #ifdef _WIN32
@ -654,6 +655,25 @@ bool CN64Rom::LoadN64Image(const char * FileLoc, bool LoadBootCodeOnly)
} }
m_RomIdent = stdstr_f("%08X-%08X-C:%X", CRC1, CRC2, m_ROMImage[0x3D]); m_RomIdent = stdstr_f("%08X-%08X-C:%X", CRC1, CRC2, m_ROMImage[0x3D]);
{
CIniFileBase::SectionList GameIdentifiers;
CIniFile RomDatabase(g_Settings->LoadStringVal(SupportFile_RomDatabase).c_str());
RomDatabase.GetVectorOfSections(GameIdentifiers);
if (GameIdentifiers.find(m_RomIdent.c_str()) == GameIdentifiers.end())
{
char InternalName[22] = { 0 };
memcpy(InternalName, (void *)(m_ROMImage + 0x20), 20);
CN64Rom::CleanRomName(InternalName);
std::string AltIdentifier = stdstr_f("%s-C:%X", stdstr(InternalName).Trim().ToUpper().c_str(), m_Country);
AltIdentifier = RomDatabase.GetString(AltIdentifier.c_str(), "Alt Identifier", "");
if (!AltIdentifier.empty())
{
m_RomIdent = AltIdentifier;
}
}
}
WriteTrace(TraceN64System, TraceDebug, "Ident: %s", m_RomIdent.c_str()); WriteTrace(TraceN64System, TraceDebug, "Ident: %s", m_RomIdent.c_str());
if (!LoadBootCodeOnly && g_Rom == this) if (!LoadBootCodeOnly && g_Rom == this)

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

@ -59,6 +59,10 @@ CRomList::CRomList() :
#endif #endif
g_Settings->RegisterChangeCB(RomList_GameDir, this, (CSettings::SettingChangedFunc)RefreshSettings); g_Settings->RegisterChangeCB(RomList_GameDir, this, (CSettings::SettingChangedFunc)RefreshSettings);
} }
if (m_RomIniFile)
{
m_RomIniFile->GetVectorOfSections(m_GameIdentifiers);
}
WriteTrace(TraceRomList, TraceVerbose, "Done"); WriteTrace(TraceRomList, TraceVerbose, "Done");
} }
@ -582,9 +586,17 @@ void CRomList::FillRomExtensionInfo(ROM_INFO * pRomInfo)
strcpy(pRomInfo->Name, "#321#"); strcpy(pRomInfo->Name, "#321#");
strcpy(pRomInfo->Status, "Unknown"); strcpy(pRomInfo->Status, "Unknown");
//Get File Identifier
char Identifier[100]; char Identifier[100];
sprintf(Identifier, "%08X-%08X-C:%X", pRomInfo->CRC1, pRomInfo->CRC2, pRomInfo->Country); sprintf(Identifier, "%08X-%08X-C:%X", pRomInfo->CRC1, pRomInfo->CRC2, pRomInfo->Country);
if (m_GameIdentifiers.find(Identifier) == m_GameIdentifiers.end())
{
std::string AltIdentifier = stdstr_f("%s-C:%X", stdstr(pRomInfo->InternalName).Trim().ToUpper().c_str(), pRomInfo->Country);
AltIdentifier = m_RomIniFile->GetString(AltIdentifier.c_str(), "Alt Identifier", "");
if (!AltIdentifier.empty())
{
strcpy(Identifier, AltIdentifier.c_str());
}
}
//Rom Notes //Rom Notes
strncpy(pRomInfo->UserNotes, m_NotesIniFile->GetString(Identifier, "Note", "").c_str(), sizeof(pRomInfo->UserNotes) / sizeof(char)); strncpy(pRomInfo->UserNotes, m_NotesIniFile->GetString(Identifier, "Note", "").c_str(), sizeof(pRomInfo->UserNotes) / sizeof(char));

1
Source/Project64-core/RomList/RomList.h
View File

@ -95,6 +95,7 @@ private:
CIniFile * m_ZipIniFile; CIniFile * m_ZipIniFile;
#endif #endif
CThread m_RefreshThread; CThread m_RefreshThread;
CIniFileBase::SectionList m_GameIdentifiers;
#define DISKSIZE_MAME 0x0435B0C0 #define DISKSIZE_MAME 0x0435B0C0
#define DISKSIZE_SDK 0x03DEC800 #define DISKSIZE_SDK 0x03DEC800