mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Made functions static

This commit is contained in:
aMannus 2022-08-23 22:14:13 +02:00
parent 35fefdecb0
commit 50b3038a13
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
soh/soh/Enhancements/randomizer/randomizer.cpp
View File

@ -4649,7 +4649,7 @@ void CreateRupeeMessages() {
} }
} }
std::string Randomizer::Randomizer_InsertRupeeName(std::string message, int language) { std::string Randomizer::InsertRupeeName(std::string message, int language) {
const char* englishRupeeNames[44] = { const char* englishRupeeNames[44] = {
"Rupees", "Bitcoin", "Bananas", "Cornflakes", "Gummybears", "Floopies", "Dollars", "Lemmings", "Rupees", "Bitcoin", "Bananas", "Cornflakes", "Gummybears", "Floopies", "Dollars", "Lemmings",
"Emeralds", "Bucks", "Rubles", "Diamonds", "Moons", "Stars", "Mana", "Doll Hairs", "Emeralds", "Bucks", "Rubles", "Diamonds", "Moons", "Stars", "Mana", "Doll Hairs",
@ -4690,12 +4690,12 @@ std::string Randomizer::Randomizer_InsertRupeeName(std::string message, int lang
return message; return message;
} }
CustomMessageEntry Randomizer::Randomizer_GetRupeeMessage(u16 rupeeTextId) { CustomMessageEntry Randomizer::GetRupeeMessage(u16 rupeeTextId) {
CustomMessageEntry messageEntry = CustomMessageEntry messageEntry =
CustomMessageManager::Instance->RetrieveMessage(Randomizer::rupeeMessageTableID, rupeeTextId); CustomMessageManager::Instance->RetrieveMessage(Randomizer::rupeeMessageTableID, rupeeTextId);
messageEntry.english = Randomizer::Randomizer_InsertRupeeName(messageEntry.english, LANGUAGE_ENG); messageEntry.english = Randomizer::InsertRupeeName(messageEntry.english, LANGUAGE_ENG);
messageEntry.german = Randomizer::Randomizer_InsertRupeeName(messageEntry.german, LANGUAGE_GER); messageEntry.german = Randomizer::InsertRupeeName(messageEntry.german, LANGUAGE_GER);
messageEntry.french = Randomizer::Randomizer_InsertRupeeName(messageEntry.french, LANGUAGE_FRA); messageEntry.french = Randomizer::InsertRupeeName(messageEntry.french, LANGUAGE_FRA);
return messageEntry; return messageEntry;
} }

4
soh/soh/Enhancements/randomizer/randomizer.h
View File

@ -48,8 +48,8 @@ class Randomizer {
GetItemID GetRandomizedItemIdFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogId); GetItemID GetRandomizedItemIdFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogId);
GetItemID GetRandomizedItemId(GetItemID ogId, s16 actorId, s16 actorParams, s16 sceneNum); GetItemID GetRandomizedItemId(GetItemID ogId, s16 actorId, s16 actorParams, s16 sceneNum);
static void CreateCustomMessages(); static void CreateCustomMessages();
std::string Randomizer_InsertRupeeName(std::string message, int language); static std::string InsertRupeeName(std::string message, int language);
CustomMessageEntry Randomizer_GetRupeeMessage(u16 rupeeTextId); static CustomMessageEntry GetRupeeMessage(u16 rupeeTextId);
}; };
#ifdef __cplusplus #ifdef __cplusplus

3
soh/soh/OTRGlobals.cpp
View File

@ -1544,8 +1544,7 @@ extern "C" int CustomMessage_RetrieveIfExists(GlobalContext* globalCtx) {
} else if (CVar_GetS32("gRandomizeRupeeNames", 0) && } else if (CVar_GetS32("gRandomizeRupeeNames", 0) &&
(textId == TEXT_BLUE_RUPEE || textId == TEXT_RED_RUPEE || textId == TEXT_PURPLE_RUPEE || (textId == TEXT_BLUE_RUPEE || textId == TEXT_RED_RUPEE || textId == TEXT_PURPLE_RUPEE ||
textId == TEXT_HUGE_RUPEE)) { textId == TEXT_HUGE_RUPEE)) {
Randomizer randomizerInstance; messageEntry = Randomizer::GetRupeeMessage(textId);
messageEntry = randomizerInstance.Randomizer_GetRupeeMessage(textId);
} }
} }
if (textId == TEXT_GS_NO_FREEZE || textId == TEXT_GS_FREEZE) { if (textId == TEXT_GS_NO_FREEZE || textId == TEXT_GS_FREEZE) {