From f57a912ca12bde7f780d7c012c7af6b72ed3a7e7 Mon Sep 17 00:00:00 2001 From: Christopher Leggett Date: Sun, 17 Jul 2022 13:31:38 -0400 Subject: [PATCH] Does some cleanup of unecessary code and cases of no string provided. --- .../Enhancements/custom_message/CustomMessage.cpp | 12 +----------- .../randomizer/randomizer_custom_messages.cpp | 2 -- soh/soh/OTRGlobals.cpp | 3 +++ 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/soh/soh/Enhancements/custom_message/CustomMessage.cpp b/soh/soh/Enhancements/custom_message/CustomMessage.cpp index 1985a2bbc..80340801d 100644 --- a/soh/soh/Enhancements/custom_message/CustomMessage.cpp +++ b/soh/soh/Enhancements/custom_message/CustomMessage.cpp @@ -60,8 +60,6 @@ void CustomMessage::CreateGetItemMessage(GetItemID giid, ItemID iid, std::string ReplaceColors(formattedMessage); formattedMessage += MESSAGE_END(); this->getItemMessageTable[i].emplace(giid, formattedMessage); - } else { - this->getItemMessageTable[i].emplace(giid, MESSAGE_END()); } } } @@ -70,15 +68,7 @@ std::string CustomMessage::RetrieveGetItemMessage(GetItemID giid) { std::unordered_map::const_iterator result = getItemMessageTable[gSaveContext.language].find(giid); if (result == getItemMessageTable[gSaveContext.language].end()) { - switch (gSaveContext.language) { - case LANGUAGE_FRA: - return "Il n'y a pas de message personnalisé pour cet élément."; - case LANGUAGE_GER: - return "Für diesen Artikel gibt es keine benutzerdefinierte Nachricht."; - case LANGUAGE_ENG: - default: - return "There is no custom message for this item."; - } + return ""; } return result->second; } diff --git a/soh/soh/Enhancements/randomizer/randomizer_custom_messages.cpp b/soh/soh/Enhancements/randomizer/randomizer_custom_messages.cpp index a31edcbee..61a2559ac 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_custom_messages.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_custom_messages.cpp @@ -1,8 +1,6 @@ #include "randomizer.h" #include "soh/Enhancements/custom_message/CustomMessage.h" -using namespace std::literals::string_literals; - #define MESSAGES(eng, ger, fra) (new std::string[]{eng, ger, fra}) void Randomizer::CreateCustomMessages() { diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index 6691127be..4459e3b19 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -1507,5 +1507,8 @@ extern "C" s32 GetRandomizedItemIdFromKnownCheck(RandomizerCheck randomizerCheck extern "C" int Randomizer_GetCustomGetItemMessage(GetItemID giid, char* buffer, const int maxBufferSize) { const std::string& getItemText = OTRGlobals::Instance->gRandomizer->GetCustomGetItemMessage(giid); + if (getItemText == "") { + return false; + } return CopyStringToCharBuffer(getItemText, buffer, maxBufferSize); }