mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-23 16:48:52 -05:00
Code Issues Projects Releases Wiki Activity

Fixes some miscellaneous issues for Switch builds.

Browse Source
This commit is contained in:
Christopher Leggett 2023-12-12 18:51:26 -05:00
parent c7c29034eb
commit 674645ef14
No known key found for this signature in database
GPG Key ID: 22E7784811D1BD98
5 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
soh/soh/Enhancements/randomizer/context.cpp
View File

@ -127,6 +127,20 @@ ItemLocation* Context::GetItemLocation(size_t locKey) {
return &itemLocationTable[static_cast<RandomizerCheck>(locKey)]; return &itemLocationTable[static_cast<RandomizerCheck>(locKey)];
} }
ItemOverride& Context::GetItemOverride(RandomizerCheck locKey) {
if (!overrides.contains(locKey)) {
overrides.emplace(locKey, ItemOverride());
}
return overrides.at(locKey);
}
ItemOverride& Context::GetItemOverride(size_t locKey) {
if (!overrides.contains(static_cast<RandomizerCheck>(locKey))) {
overrides.emplace(static_cast<RandomizerCheck>(locKey), ItemOverride());
}
return overrides.at(static_cast<RandomizerCheck>(locKey));
}
void Context::PlaceItemInLocation(const RandomizerCheck locKey, const RandomizerGet item, const bool applyEffectImmediately, void Context::PlaceItemInLocation(const RandomizerCheck locKey, const RandomizerGet item, const bool applyEffectImmediately,
const bool setHidden) { const bool setHidden) {
const auto loc = GetItemLocation(locKey); const auto loc = GetItemLocation(locKey);

2
soh/soh/Enhancements/randomizer/context.h
View File

@ -37,6 +37,8 @@ class Context {
RandomizerArea hintedArea = RA_NONE); RandomizerArea hintedArea = RA_NONE);
ItemLocation* GetItemLocation(RandomizerCheck locKey); ItemLocation* GetItemLocation(RandomizerCheck locKey);
ItemLocation* GetItemLocation(size_t locKey); ItemLocation* GetItemLocation(size_t locKey);
ItemOverride& GetItemOverride(RandomizerCheck locKey);
ItemOverride& GetItemOverride(size_t locKey);
void PlaceItemInLocation(RandomizerCheck locKey, RandomizerGet item, bool applyEffectImmediately = false, void PlaceItemInLocation(RandomizerCheck locKey, RandomizerGet item, bool applyEffectImmediately = false,
bool setHidden = false); bool setHidden = false);
std::vector<RandomizerCheck> allLocations; std::vector<RandomizerCheck> allLocations;

3
soh/soh/OTRGlobals.cpp
View File

@ -2355,6 +2355,9 @@ extern "C" GetItemEntry ItemTable_Retrieve(int16_t getItemID) {
} }
extern "C" GetItemEntry ItemTable_RetrieveEntry(s16 tableID, s16 getItemID) { extern "C" GetItemEntry ItemTable_RetrieveEntry(s16 tableID, s16 getItemID) {
if (tableID == MOD_RANDOMIZER) {
return Rando::StaticData::RetrieveItem(static_cast<RandomizerGet>(getItemID)).GetGIEntry_Copy();
}
return ItemTableManager::Instance->RetrieveItemEntry(tableID, getItemID); return ItemTableManager::Instance->RetrieveItemEntry(tableID, getItemID);
} }

13
soh/soh/SaveManager.cpp
View File

@ -331,13 +331,12 @@ void SaveManager::LoadRandomizerVersion3() {
RandomizerGet rg = RG_NONE; RandomizerGet rg = RG_NONE;
SaveManager::Instance->LoadData("fakeRgID", rg, RG_NONE); SaveManager::Instance->LoadData("fakeRgID", rg, RG_NONE);
if (rg != RG_NONE) { if (rg != RG_NONE) {
randoContext->overrides[static_cast<RandomizerCheck>(i)] = randoContext->overrides.emplace(static_cast<RandomizerCheck>(i), Rando::ItemOverride(static_cast<RandomizerCheck>(i), rg));
Rando::ItemOverride(static_cast<RandomizerCheck>(i), rg);
SaveManager::Instance->LoadStruct("trickName", [&]() { SaveManager::Instance->LoadStruct("trickName", [&]() {
SaveManager::Instance->LoadData( SaveManager::Instance->LoadData(
"english", randoContext->overrides[static_cast<RandomizerCheck>(i)].GetTrickName().english); "english", randoContext->GetItemOverride(i).GetTrickName().english);
SaveManager::Instance->LoadData( SaveManager::Instance->LoadData(
"french", randoContext->overrides[static_cast<RandomizerCheck>(i)].GetTrickName().french); "french", randoContext->GetItemOverride(i).GetTrickName().french);
}); });
} }
uint16_t price = 0; uint16_t price = 0;
@ -437,10 +436,10 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f
SaveManager::Instance->SaveStruct("", [&]() { SaveManager::Instance->SaveStruct("", [&]() {
SaveManager::Instance->SaveData("rgID", randoContext->GetItemLocation(i)->GetPlacedRandomizerGet()); SaveManager::Instance->SaveData("rgID", randoContext->GetItemLocation(i)->GetPlacedRandomizerGet());
if (randoContext->GetItemLocation(i)->GetPlacedRandomizerGet() == RG_ICE_TRAP) { if (randoContext->GetItemLocation(i)->GetPlacedRandomizerGet() == RG_ICE_TRAP) {
SaveManager::Instance->SaveData("fakeRgID", randoContext->overrides[static_cast<RandomizerCheck>(i)].LooksLike()); SaveManager::Instance->SaveData("fakeRgID", randoContext->GetItemOverride(i).LooksLike());
SaveManager::Instance->SaveStruct("trickName", [&]() { SaveManager::Instance->SaveStruct("trickName", [&]() {
SaveManager::Instance->SaveData("english", randoContext->overrides[static_cast<RandomizerCheck>(i)].GetTrickName().GetEnglish()); SaveManager::Instance->SaveData("english", randoContext->GetItemOverride(i).GetTrickName().GetEnglish());
SaveManager::Instance->SaveData("french", randoContext->overrides[static_cast<RandomizerCheck>(i)].GetTrickName().GetFrench()); SaveManager::Instance->SaveData("french", randoContext->GetItemOverride(i).GetTrickName().GetFrench());
// TODO: German (trick names don't have german translations yet) // TODO: German (trick names don't have german translations yet)
}); });
} }

3
soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
View File

@ -1336,7 +1336,8 @@ void FileChoose_GenerateRandoSeed(GameState* thisx) {
memcpy(Save_GetSaveMetaInfo(this->buttonIndex)->playerName, memcpy(Save_GetSaveMetaInfo(this->buttonIndex)->playerName,
CVarGetInteger("gLinkDefaultName", 0) ? &linkName : &emptyName, 8); CVarGetInteger("gLinkDefaultName", 0) ? &linkName : &emptyName, 8);
return; return;
} else { }
if (!generating) {
Randomizer_GenerateSeed(); Randomizer_GenerateSeed();
} }
} }