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

Fix memcard path CVars and add menu notifying player when they've been reset

This commit is contained in:
Phillip Stephens 2021-06-02 08:06:22 -07:00
parent 561e54527b
commit c6db983c41
Signed by: Antidote
GPG Key ID: F8BEE4C83DACA60D
7 changed files with 161 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Runtime/CMemoryCardSys.cpp
View File

@ -336,6 +336,9 @@ ECardResult CMemoryCardSys::CCardFileInfo::WriteFile() {
} }
ECardResult CMemoryCardSys::CCardFileInfo::CloseFile() { return CMemoryCardSys::CloseFile(m_handle); } ECardResult CMemoryCardSys::CCardFileInfo::CloseFile() { return CMemoryCardSys::CloseFile(m_handle); }
kabufuda::SystemString CMemoryCardSys::_GetDolphinCardPath(kabufuda::ECardSlot slot) {
return g_CardImagePaths[static_cast<u32>(slot)];
}
void CMemoryCardSys::_ResolveDolphinCardPath(const hecl::CVar* cv, kabufuda::ECardSlot slot) { void CMemoryCardSys::_ResolveDolphinCardPath(const hecl::CVar* cv, kabufuda::ECardSlot slot) {
#if CARD_UCS2 #if CARD_UCS2
@ -559,19 +562,31 @@ void CMemoryCardSys::CommitToDisk(kabufuda::ECardSlot port) {
card.commit(); card.commit();
} }
kabufuda::SystemString CMemoryCardSys::CreateDolphinCard(kabufuda::ECardSlot slot) { bool CMemoryCardSys::CreateDolphinCard(kabufuda::ECardSlot slot) {
kabufuda::SystemString path = _CreateDolphinCard(slot); kabufuda::SystemString path =
_CreateDolphinCard(slot, slot == kabufuda::ECardSlot::SlotA ? mc_dolphinAPath->hasDefaultValue()
: mc_dolphinBPath->hasDefaultValue());
if (CardProbe(slot).x0_error != ECardResult::READY) { if (CardProbe(slot).x0_error != ECardResult::READY) {
return {}; return false;
} }
MountCard(slot); MountCard(slot);
FormatCard(slot); FormatCard(slot);
kabufuda::Card& card = g_CardStates[int(slot)]; kabufuda::Card& card = g_CardStates[int(slot)];
card.waitForCompletion(); card.waitForCompletion();
return path; return true;
} }
void CMemoryCardSys::_ResetCVar(kabufuda::ECardSlot slot) {
switch(slot) {
case kabufuda::ECardSlot::SlotA:
mc_dolphinAPath->fromLiteral("");
break;
case kabufuda::ECardSlot::SlotB:
mc_dolphinBPath->fromLiteral("");
break;
}
}
void CMemoryCardSys::Shutdown() { void CMemoryCardSys::Shutdown() {
UnmountCard(kabufuda::ECardSlot::SlotA); UnmountCard(kabufuda::ECardSlot::SlotA);
UnmountCard(kabufuda::ECardSlot::SlotB); UnmountCard(kabufuda::ECardSlot::SlotB);

6
Runtime/CMemoryCardSys.hpp
View File

@ -67,10 +67,12 @@ class CMemoryCardSys {
rstl::reserved_vector<u32, 6> x30_scanCategoryCounts; rstl::reserved_vector<u32, 6> x30_scanCategoryCounts;
public: public:
static void _ResetCVar(kabufuda::ECardSlot slot);
static void _ResolveDolphinCardPath(const hecl::CVar* cv, kabufuda::ECardSlot slot); static void _ResolveDolphinCardPath(const hecl::CVar* cv, kabufuda::ECardSlot slot);
static kabufuda::SystemString ResolveDolphinCardPath(kabufuda::ECardSlot slot); static kabufuda::SystemString ResolveDolphinCardPath(kabufuda::ECardSlot slot);
static kabufuda::SystemString CreateDolphinCard(kabufuda::ECardSlot slot); static bool CreateDolphinCard(kabufuda::ECardSlot slot);
static kabufuda::SystemString _CreateDolphinCard(kabufuda::ECardSlot slot); static kabufuda::SystemString _GetDolphinCardPath(kabufuda::ECardSlot slot);
static kabufuda::SystemString _CreateDolphinCard(kabufuda::ECardSlot slot, bool dolphin);
using ECardResult = kabufuda::ECardResult; using ECardResult = kabufuda::ECardResult;
struct CardResult { struct CardResult {

44
Runtime/CMemoryCardSysNix.cpp
View File

@ -31,27 +31,39 @@ kabufuda::SystemString CMemoryCardSys::ResolveDolphinCardPath(kabufuda::ECardSlo
return {}; return {};
} }
kabufuda::SystemString CMemoryCardSys::_CreateDolphinCard(kabufuda::ECardSlot slot) { kabufuda::SystemString CMemoryCardSys::_CreateDolphinCard(kabufuda::ECardSlot slot, bool dolphin) {
if (g_Main->IsUSA() && !g_Main->IsTrilogy()) { if (g_Main->IsUSA() && !g_Main->IsTrilogy()) {
const char* home = getenv("HOME"); if (dolphin) {
if (!home || home[0] != '/') const char* home = getenv("HOME");
return {}; if (!home || home[0] != '/')
const char* dataHome = getenv("XDG_DATA_HOME"); return {};
const char* dataHome = getenv("XDG_DATA_HOME");
/* XDG-selected data path */ /* XDG-selected data path */
kabufuda::SystemString path = kabufuda::SystemString path =
((dataHome && dataHome[0] == '/') ? dataHome : hecl::SystemString(home)) + "/.local/share/dolphin-emu/GC"; ((dataHome && dataHome[0] == '/') ? dataHome : hecl::SystemString(home)) + "/.local/share/dolphin-emu/GC";
if (hecl::RecursiveMakeDir(path.c_str()) < 0) if (hecl::RecursiveMakeDir(path.c_str()) < 0)
return {}; return {};
path += fmt::format(FMT_STRING("/MemoryCard{:c}.USA.raw"), slot == kabufuda::ECardSlot::SlotA ? 'A' : 'B'); path += fmt::format(FMT_STRING("/MemoryCard{:c}.USA.raw"), slot == kabufuda::ECardSlot::SlotA ? 'A' : 'B');
const auto fp = hecl::FopenUnique(path.c_str(), "wb"); const auto fp = hecl::FopenUnique(path.c_str(), "wb");
if (fp == nullptr) { if (fp != nullptr) {
return {}; return path;
}
} else {
kabufuda::SystemString path = _GetDolphinCardPath(slot);
hecl::SanitizePath(path);
if (path.find('/') == kabufuda::SystemString::npos) {
path = hecl::GetcwdStr() + _SYS_STR("/") + _GetDolphinCardPath(slot);
}
hecl::SystemString tmpPath = path.substr(0, path.find_last_of(_SYS_STR("/")));
hecl::RecursiveMakeDir(tmpPath.c_str());
const auto fp = hecl::FopenUnique(path.c_str(), "wb");
if (fp) {
return path;
}
} }
return path;
} }
return {}; return {};
} }

42
Runtime/CMemoryCardSysOSX.cpp
View File

@ -22,24 +22,38 @@ kabufuda::SystemString CMemoryCardSys::ResolveDolphinCardPath(kabufuda::ECardSlo
return {}; return {};
} }
kabufuda::SystemString CMemoryCardSys::_CreateDolphinCard(kabufuda::ECardSlot slot) { kabufuda::SystemString CMemoryCardSys::_CreateDolphinCard(kabufuda::ECardSlot slot, bool dolphin) {
if (g_Main->IsUSA() && !g_Main->IsTrilogy()) { if (g_Main->IsUSA() && !g_Main->IsTrilogy()) {
const char* home = getenv("HOME"); if (dolphin) {
if (!home) const char* home = getenv("HOME");
return {}; if (!home)
return {};
kabufuda::SystemString path = home; kabufuda::SystemString path = home;
path += "/Library/Application Support/Dolphin/GC"; path += "/Library/Application Support/Dolphin/GC";
if (hecl::RecursiveMakeDir(path.c_str()) < 0) if (hecl::RecursiveMakeDir(path.c_str()) < 0)
return {}; return {};
path += fmt::format(FMT_STRING("/MemoryCard{:c}.USA.raw"), slot == kabufuda::ECardSlot::SlotA ? 'A' : 'B'); path += fmt::format(FMT_STRING("/MemoryCard{:c}.USA.raw"), slot == kabufuda::ECardSlot::SlotA ? 'A' : 'B');
const auto fp = hecl::FopenUnique(path.c_str(), "wb"); const auto fp = hecl::FopenUnique(path.c_str(), "wb");
if (fp == nullptr) { if (fp == nullptr) {
return {}; return {};
}
return path;
} else {
kabufuda::SystemString path = _GetDolphinCardPath(slot);
hecl::SanitizePath(path);
if (path.find('/') == kabufuda::SystemString::npos) {
path = hecl::GetcwdStr() + _SYS_STR("/") + _GetDolphinCardPath(slot);
}
hecl::SystemString tmpPath = path.substr(0, path.find_last_of(_SYS_STR("/")));
hecl::RecursiveMakeDir(tmpPath.c_str());
const auto fp = hecl::FopenUnique(path.c_str(), "wb");
if (fp) {
return path;
}
} }
return path;
} }
return {}; return {};
} }

96
Runtime/CMemoryCardSysWin.cpp
View File

@ -14,53 +14,67 @@ using namespace Windows::Storage;
/* Partial path-selection logic from /* Partial path-selection logic from
* https://github.com/dolphin-emu/dolphin/blob/master/Source/Core/UICommon/UICommon.cpp * https://github.com/dolphin-emu/dolphin/blob/master/Source/Core/UICommon/UICommon.cpp
* Modified to not use dolphin-binary-relative paths. */ * Modified to not use dolphin-binary-relative paths. */
kabufuda::SystemString CMemoryCardSys::ResolveDolphinCardPath(kabufuda::ECardSlot slot) { kabufuda::SystemString CMemoryCardSys::ResolveDolphinCardPath(kabufuda::ECardSlot slot, bool dolphin) {
if (g_Main->IsUSA() && !g_Main->IsTrilogy()) { if (g_Main->IsUSA() && !g_Main->IsTrilogy()) {
if (dolphin) {
#if !WINDOWS_STORE #if !WINDOWS_STORE
/* Detect where the User directory is. There are two different cases /* Detect where the User directory is. There are two different cases
* 1. HKCU\Software\Dolphin Emulator\UserConfigPath exists * 1. HKCU\Software\Dolphin Emulator\UserConfigPath exists
* -> Use this as the user directory path * -> Use this as the user directory path
* 2. My Documents exists * 2. My Documents exists
* -> Use My Documents\Dolphin Emulator as the User directory path * -> Use My Documents\Dolphin Emulator as the User directory path
*/ */
/* Check our registry keys */ /* Check our registry keys */
HKEY hkey; HKEY hkey;
kabufuda::SystemChar configPath[MAX_PATH] = {0}; kabufuda::SystemChar configPath[MAX_PATH] = {0};
if (RegOpenKeyEx(HKEY_CURRENT_USER, _SYS_STR("Software\\Dolphin Emulator"), 0, KEY_QUERY_VALUE, &hkey) == if (RegOpenKeyEx(HKEY_CURRENT_USER, _SYS_STR("Software\\Dolphin Emulator"), 0, KEY_QUERY_VALUE, &hkey) ==
ERROR_SUCCESS) { ERROR_SUCCESS) {
DWORD size = MAX_PATH; DWORD size = MAX_PATH;
if (RegQueryValueEx(hkey, _SYS_STR("UserConfigPath"), nullptr, nullptr, (LPBYTE)configPath, &size) != if (RegQueryValueEx(hkey, _SYS_STR("UserConfigPath"), nullptr, nullptr, (LPBYTE)configPath, &size) !=
ERROR_SUCCESS) ERROR_SUCCESS)
configPath[0] = 0; configPath[0] = 0;
RegCloseKey(hkey); RegCloseKey(hkey);
} }
/* Get My Documents path in case we need it. */ /* Get My Documents path in case we need it. */
kabufuda::SystemChar my_documents[MAX_PATH]; kabufuda::SystemChar my_documents[MAX_PATH];
bool my_documents_found = bool my_documents_found =
SUCCEEDED(SHGetFolderPath(nullptr, CSIDL_MYDOCUMENTS, nullptr, SHGFP_TYPE_CURRENT, my_documents)); SUCCEEDED(SHGetFolderPath(nullptr, CSIDL_MYDOCUMENTS, nullptr, SHGFP_TYPE_CURRENT, my_documents));
kabufuda::SystemString path; kabufuda::SystemString path;
if (configPath[0]) /* Case 1 */ if (configPath[0]) /* Case 1 */
path = configPath; path = configPath;
else if (my_documents_found) /* Case 2 */ else if (my_documents_found) /* Case 2 */
path = kabufuda::SystemString(my_documents) + _SYS_STR("/Dolphin Emulator"); path = kabufuda::SystemString(my_documents) + _SYS_STR("/Dolphin Emulator");
else /* Unable to find */ else /* Unable to find */
return {}; return {};
#else #else
StorageFolder ^ localFolder = ApplicationData::Current->LocalFolder; StorageFolder ^ localFolder = ApplicationData::Current->LocalFolder;
kabufuda::SystemString path(localFolder->Path->Data()); kabufuda::SystemString path(localFolder->Path->Data());
#endif #endif
path += fmt::format(FMT_STRING(_SYS_STR("/GC/MemoryCard{}.USA.raw")), path += fmt::format(FMT_STRING(_SYS_STR("/GC/MemoryCard{}.USA.raw")),
slot == kabufuda::ECardSlot::SlotA ? _SYS_STR('A') : _SYS_STR('B')); slot == kabufuda::ECardSlot::SlotA ? _SYS_STR('A') : _SYS_STR('B'));
hecl::Sstat theStat; hecl::Sstat theStat;
if (hecl::Stat(path.c_str(), &theStat) || !S_ISREG(theStat.st_mode)) if (hecl::Stat(path.c_str(), &theStat) || !S_ISREG(theStat.st_mode))
return {}; return {};
return path; return path;
} else {
kabufuda::SystemString path = _GetDolphinCardPath(slot);
hecl::SanitizePath(path);
if (path.find('/') == kabufuda::SystemString::npos) {
path = hecl::GetcwdStr() + _SYS_STR("/") + _GetDolphinCardPath(slot);
}
hecl::SystemString tmpPath = path.substr(0, path.find_last_of(_SYS_STR("/")));
hecl::RecursiveMakeDir(tmpPath.c_str());
const auto fp = hecl::FopenUnique(path.c_str(), "wb");
if (fp) {
return path;
}
}
} }
return {}; return {};
} }
@ -69,10 +83,10 @@ kabufuda::SystemString CMemoryCardSys::_CreateDolphinCard(kabufuda::ECardSlot sl
if (g_Main->IsUSA() && !g_Main->IsTrilogy()) { if (g_Main->IsUSA() && !g_Main->IsTrilogy()) {
#if !WINDOWS_STORE #if !WINDOWS_STORE
/* Detect where the User directory is. There are two different cases /* Detect where the User directory is. There are two different cases
* 1. HKCU\Software\Dolphin Emulator\UserConfigPath exists * 1. HKCU\Software\Dolphin Emulator\UserConfigPath exists
* -> Use this as the user directory path * -> Use this as the user directory path
* 2. My Documents exists * 2. My Documents exists
* -> Use My Documents\Dolphin Emulator as the User directory path * -> Use My Documents\Dolphin Emulator as the User directory path
*/ */
/* Check our registry keys */ /* Check our registry keys */

25
Runtime/MP1/CSaveGameScreen.cpp
View File

@ -131,6 +131,9 @@ bool CSaveGameScreen::PumpLoad() {
} }
CSaveGameScreen::EUIType CSaveGameScreen::SelectUIType() const { CSaveGameScreen::EUIType CSaveGameScreen::SelectUIType() const {
if (x10_uiType == EUIType::CreateDolphinCardFailed) {
return x10_uiType;
}
if (x6c_cardDriver->x10_state == EState::NoCard) { if (x6c_cardDriver->x10_state == EState::NoCard) {
return EUIType::NoCardFound; return EUIType::NoCardFound;
} }
@ -312,6 +315,12 @@ void CSaveGameScreen::SetUIText() {
opt1 = 15; // No opt1 = 15; // No
} }
break; break;
case EUIType::CreateDolphinCardFailed:
msgAStr = u"Attempt to create Dolphin Card failed!\n";
msgBStr = u"CVars have been reset to defaults.\nMetaforce will use Dolphin's memory cards if available\n";
opt0 = -2;
opt0Str = u"Press &image=SI,1.0,0.68,05AF9CAA; to proceed.\n";
break;
default: default:
break; break;
} }
@ -392,7 +401,12 @@ void CSaveGameScreen::DoAdvance([[maybe_unused]] CGuiTableGroup* caller) {
sfx = x84_navConfirmSfx; sfx = x84_navConfirmSfx;
} else if (userSel == 2 && x10_uiType == EUIType::NoCardFound) { } else if (userSel == 2 && x10_uiType == EUIType::NoCardFound) {
/* Create Dolphin Card */ /* Create Dolphin Card */
CMemoryCardSys::CreateDolphinCard(kabufuda::ECardSlot::SlotA); if (!CMemoryCardSys::CreateDolphinCard(kabufuda::ECardSlot::SlotA)) {
x10_uiType = EUIType::CreateDolphinCardFailed;
sfx = x8c_navBackSfx;
x91_uiTextDirty = true;
break;
}
ResetCardDriver(); ResetCardDriver();
sfx = x84_navConfirmSfx; sfx = x84_navConfirmSfx;
} }
@ -556,6 +570,15 @@ void CSaveGameScreen::DoAdvance([[maybe_unused]] CGuiTableGroup* caller) {
} }
} }
break; break;
case EUIType::CreateDolphinCardFailed: {
if (userSel == 0) {
CMemoryCardSys::_ResetCVar(kabufuda::ECardSlot::SlotA);
CMemoryCardSys::ResolveDolphinCardPath(kabufuda::ECardSlot::SlotA);
ResetCardDriver();
x10_uiType = EUIType::Empty;
sfx = x84_navConfirmSfx;
}
} break;
default: default:
break; break;

4
Runtime/MP1/CSaveGameScreen.hpp
View File

@ -41,7 +41,9 @@ public:
ProgressWillBeLost = 13, ProgressWillBeLost = 13,
NotOriginalCard = 14, NotOriginalCard = 14,
AllDataWillBeLost = 15, AllDataWillBeLost = 15,
SaveReady = 16 SaveReady = 16,
// Metaforce Addition
CreateDolphinCardFailed
}; };
bool IsHiddenFromFrontEnd() const { bool IsHiddenFromFrontEnd() const {