AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use game disc title in log message

This commit is contained in:
Luke Street 2022-02-23 01:38:01 -05:00
parent 9966ca13fb
commit 848a8e4201
3 changed files with 38 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/IMain.hpp
View File

@ -23,6 +23,7 @@ struct MetaforceVersionInfo {
std::string version; std::string version;
ERegion region; ERegion region;
EGame game; EGame game;
std::string gameTitle;
}; };
class CStopwatch; class CStopwatch;
@ -47,6 +48,7 @@ public:
virtual bool IsUSA() const = 0; virtual bool IsUSA() const = 0;
virtual bool IsKorean() const = 0; virtual bool IsKorean() const = 0;
virtual bool IsTrilogy() const = 0; virtual bool IsTrilogy() const = 0;
virtual std::string GetGameTitle() const = 0;
virtual std::string_view GetVersionString() const = 0; virtual std::string_view GetVersionString() const = 0;
virtual void Quit() = 0; virtual void Quit() = 0;
virtual bool IsPaused() const = 0; virtual bool IsPaused() const = 0;

67
Runtime/MP1/MP1.cpp
View File

@ -584,37 +584,40 @@ void CMain::Init(const FileStoreManager& storeMgr, CVarManager* cvarMgr, boo::IA
m_cvarMgr = cvarMgr; m_cvarMgr = cvarMgr;
m_cvarCommons = std::make_unique<CVarCommons>(*m_cvarMgr); m_cvarCommons = std::make_unique<CVarCommons>(*m_cvarMgr);
const auto discInfo = CDvdFile::DiscInfo(); {
if (discInfo.gameId[4] != '0' || discInfo.gameId[5] != '1') { const auto discInfo = CDvdFile::DiscInfo();
Log.report(logvisor::Fatal, FMT_STRING("Unknown game ID {}"), std::string_view{discInfo.gameId.data(), 6}); if (discInfo.gameId[4] != '0' || discInfo.gameId[5] != '1') {
} Log.report(logvisor::Fatal, FMT_STRING("Unknown game ID {}"), std::string_view{discInfo.gameId.data(), 6});
if (strncmp(discInfo.gameId.data(), "GM8", 3) == 0 || strncmp(discInfo.gameId.data(), "R3I", 3) == 0) {
m_version.game = EGame::MetroidPrime1;
} else if (strncmp(discInfo.gameId.data(), "G2M", 3) == 0 || strncmp(discInfo.gameId.data(), "R32", 3) == 0) {
m_version.game = EGame::MetroidPrime2;
} else if (strncmp(discInfo.gameId.data(), "R3M", 3) == 0) {
m_version.game = EGame::MetroidPrime3;
} else if (strncmp(discInfo.gameId.data(), "RM3", 3) == 0) {
m_version.game = EGame::MetroidPrimeTrilogy;
} else {
Log.report(logvisor::Fatal, FMT_STRING("Unknown game ID {}"), std::string_view{discInfo.gameId.data(), 6});
}
switch (discInfo.gameId[3]) {
case 'E':
if (m_version.game == EGame::MetroidPrime1 && discInfo.version == 48) {
m_version.region = ERegion::KOR;
} else {
m_version.region = ERegion::USA;
} }
break; if (strncmp(discInfo.gameId.data(), "GM8", 3) == 0 || strncmp(discInfo.gameId.data(), "R3I", 3) == 0) {
case 'J': m_version.game = EGame::MetroidPrime1;
m_version.region = ERegion::JPN; } else if (strncmp(discInfo.gameId.data(), "G2M", 3) == 0 || strncmp(discInfo.gameId.data(), "R32", 3) == 0) {
break; m_version.game = EGame::MetroidPrime2;
case 'P': } else if (strncmp(discInfo.gameId.data(), "R3M", 3) == 0) {
m_version.region = ERegion::PAL; m_version.game = EGame::MetroidPrime3;
break; } else if (strncmp(discInfo.gameId.data(), "RM3", 3) == 0) {
default: m_version.game = EGame::MetroidPrimeTrilogy;
Log.report(logvisor::Fatal, FMT_STRING("Unknown region {}"), discInfo.gameId[3]); } else {
Log.report(logvisor::Fatal, FMT_STRING("Unknown game ID {}"), std::string_view{discInfo.gameId.data(), 6});
}
switch (discInfo.gameId[3]) {
case 'E':
if (m_version.game == EGame::MetroidPrime1 && discInfo.version == 48) {
m_version.region = ERegion::KOR;
} else {
m_version.region = ERegion::USA;
}
break;
case 'J':
m_version.region = ERegion::JPN;
break;
case 'P':
m_version.region = ERegion::PAL;
break;
default:
Log.report(logvisor::Fatal, FMT_STRING("Unknown region {}"), discInfo.gameId[3]);
}
m_version.gameTitle = std::move(discInfo.gameTitle);
} }
if (m_version.game != EGame::MetroidPrime1 && m_version.game != EGame::MetroidPrimeTrilogy) { if (m_version.game != EGame::MetroidPrime1 && m_version.game != EGame::MetroidPrimeTrilogy) {
@ -642,8 +645,8 @@ void CMain::Init(const FileStoreManager& storeMgr, CVarManager* cvarMgr, boo::IA
x70_tweaks.RegisterResourceTweaks(m_cvarMgr); x70_tweaks.RegisterResourceTweaks(m_cvarMgr);
AddWorldPaks(); AddWorldPaks();
MainLog.report(logvisor::Level::Info, FMT_STRING("Loading data from {} version {} from region {}"), MainLog.report(logvisor::Level::Info, FMT_STRING("Loading data from {} {} ({})"),
magic_enum::enum_name(GetGame()), GetVersionString(), magic_enum::enum_name(GetRegion())); GetGameTitle(), magic_enum::enum_name(GetRegion()), GetVersionString());
auto args = aurora::get_args(); auto args = aurora::get_args();
for (auto it = args.begin(); it != args.end(); ++it) { for (auto it = args.begin(); it != args.end(); ++it) {

1
Runtime/MP1/MP1.hpp
View File

@ -293,6 +293,7 @@ public:
bool IsTrilogy() const override { return m_version.game == EGame::MetroidPrimeTrilogy; } bool IsTrilogy() const override { return m_version.game == EGame::MetroidPrimeTrilogy; }
ERegion GetRegion() const override { return m_version.region; } ERegion GetRegion() const override { return m_version.region; }
EGame GetGame() const override { return m_version.game; } EGame GetGame() const override { return m_version.game; }
std::string GetGameTitle() const override { return m_version.gameTitle; }
std::string_view GetVersionString() const override { return m_version.version; } std::string_view GetVersionString() const override { return m_version.version; }
void Quit() override { m_doQuit = true; } void Quit() override { m_doQuit = true; }
bool IsPaused() const override { return m_paused; } bool IsPaused() const override { return m_paused; }