remove unused 3drando custom message code (#5138)

soh/soh/Enhancements/randomizer/3drando/custom_messages.cpp

@@ -2,258 +2,9 @@
 #include "../../custom-message/CustomMessageManager.h"
 #include "z64item.h"
 
-#include <array>
-#include <set>
-#include <sstream>
-
 namespace CustomMessages {
-
 using namespace std::literals::string_literals;
 
-class MessageEntryComp {
-public:
-    bool operator()(const MessageEntry& lhs, const MessageEntry& rhs) const {
-        return lhs.id < rhs.id;
-    }
-};
-
-constexpr std::array EnglishDungeonNames = {
-    "Deku Tree",
-    "Dodongo's Cavern",
-    "Jabu Jabu's Belly",
-    "Forest Temple",
-    "Fire Temple",
-    "Water Temple",
-    "Spirit Temple",
-    "Shadow Temple",
-    "Bottom of the Well",
-    "Ice Cavern",
-    "Ganon's Tower",
-    "Gerudo Training Ground",
-    "Gerudo Fortress",
-    "Ganon's Castle",
-};
-
-constexpr std::array FrenchDungeonNames = {
-    "Vénérable Arbre Mojo",
-    "Caverne Dodongo",
-    "Ventre de Jabu-Jabu",
-    "Temple de la Forêt",
-    "Temple du Feu",
-    "Temple de l'Eau",
-    "Temple de l'Esprit",
-    "Temple de l'Ombre",
-    "Puits",
-    "Caverne Polaire",
-    "Tour de Ganon",
-    "Gymnase Gerudo",
-    "Repaire des Voleurs",
-    "Château de Ganon",
-};
-
-constexpr std::array FrenchDungeonArticles = {
-    "du ",
-    "de la ",
-    "du ",
-    "du ",
-    "du ",
-    "du ",
-    "du ",
-    "du ",
-    "du ",
-    "de la ",
-    "",
-    "du ",
-    "de la ",
-    "du ",
-};
-
-constexpr std::array SpanishDungeonNames = {
-    "Gran Árbol Deku",
-    "Cueva de los Dodongos",
-    "Tripa de Jabu-Jabu",
-    "Templo del Bosque",
-    "Templo del Fuego",
-    "Templo del Agua",
-    "Templo del Espíritu",
-    "Templo de las Sombras",
-    "Fondo del pozo",
-    "Caverna de hielo",
-    "Torre de Ganon",
-    "Centro de Instrucción Gerudo",
-    "Fortaleza Gerudo",
-    "Castillo de Ganon",
-};
-
-constexpr std::array SpanishDungeonArticles = {
-    "del",
-    "de la",
-    "de la",
-    "del",
-    "del",
-    "del",
-    "del",
-    "del",
-    "del",
-    "de la",
-    "de la",
-    "del",
-    "de la",
-    "del",
-};
-
-constexpr std::array DungeonColors = {
-    QM_GREEN,
-    QM_RED,
-    QM_BLUE,
-    QM_GREEN,
-    QM_RED,
-    QM_BLUE,
-    QM_YELLOW,
-    QM_PINK,
-    QM_PINK,
-    QM_LBLUE,
-    QM_BLACK,
-    QM_YELLOW,
-    QM_YELLOW,
-    QM_RED,
-};
-
-    std::set<MessageEntry, MessageEntryComp> messageEntries;
-    std::stringstream messageData;
-
-    //textBoxType and textBoxPosition are defined here: https://wiki.cloudmodding.com/oot/Text_Format#Message_Id
-    void CreateMessage(uint32_t textId, uint32_t unk_04, uint32_t textBoxType, uint32_t textBoxPosition,
-                       std::string englishText, std::string frenchText, std::string spanishText) {
-            MessageEntry newEntry = { textId, unk_04, textBoxType, textBoxPosition, { 0 } };
-
-            while ((englishText.size() % 4) != 0) {
-              englishText += "\0"s;
-            }
-            messageData.seekg(0, messageData.end);
-            newEntry.info[ENGLISH_U].offset = (char*)((int)messageData.tellg());
-            newEntry.info[ENGLISH_U].length = englishText.size();
-            messageData << englishText;
-
-            while ((frenchText.size() % 4) != 0) {
-              frenchText += "\0"s;
-            }
-            messageData.seekg(0, messageData.end);
-            newEntry.info[FRENCH_U].offset = (char*)((int)messageData.tellg());
-            newEntry.info[FRENCH_U].length = frenchText.size();
-            messageData << frenchText;
-
-            while ((spanishText.size() % 4) != 0) {
-              spanishText += "\0"s;
-            }
-            messageData.seekg(0, messageData.end);
-            newEntry.info[SPANISH_U].offset = (char*)((int)messageData.tellg());
-            newEntry.info[SPANISH_U].length = spanishText.size();
-            messageData << spanishText;
-
-            messageEntries.insert(newEntry);
-    }
-
-    void CreateMessageFromTextObject(uint32_t textId, uint32_t unk_04, uint32_t textBoxType, uint32_t textBoxPosition, const Text& text) {
-        CreateMessage(textId, unk_04, textBoxType, textBoxPosition, text.GetEnglish(), text.GetFrench(), text.GetSpanish());
-    }
-
-    Text AddColorsAndFormat(Text text, const std::vector<std::string>& colors /*= {}*/) {
-
-      //for each language
-      for (std::string* textStr : {&text.english, &text.french, &text.spanish}) {
-
-        //insert playername
-        size_t atSymbol = textStr->find('@');
-        while (atSymbol != std::string::npos) {
-          textStr->replace(atSymbol, 1, PLAYER_NAME());
-          atSymbol = textStr->find('@');
-        }
-        //insert newlines either manually or when encountering a '&'
-        constexpr size_t lineLength = 44;
-        size_t lastNewline = 0;
-        while (lastNewline + lineLength < textStr->length()) {
-          size_t carrot     = textStr->find('^', lastNewline);
-          size_t ampersand  = textStr->find('&', lastNewline);
-          size_t lastSpace  = textStr->rfind(' ', lastNewline + lineLength);
-          size_t lastPeriod = textStr->rfind('.', lastNewline + lineLength);
-          //replace '&' first if it's within the newline range
-          if (ampersand < lastNewline + lineLength) {
-            textStr->replace(ampersand, 1, NEWLINE());
-            lastNewline = ampersand + NEWLINE().length();
-          //or move the lastNewline cursor to the next line if a '^' is encountered
-          } else if (carrot < lastNewline + lineLength) {
-            lastNewline = carrot + 1;
-          //some lines need to be split but don't have spaces, look for periods instead
-          } else if (lastSpace == std::string::npos) {
-            textStr->replace(lastPeriod, 1, "."+NEWLINE());
-            lastNewline = lastPeriod + NEWLINE().length() + 1;
-          } else {
-            textStr->replace(lastSpace, 1, NEWLINE());
-            lastNewline = lastSpace + NEWLINE().length();
-          }
-        }
-        //clean up any remaining '&' characters
-        size_t ampersand = textStr->find('&');
-        while (ampersand != std::string::npos) {
-          textStr->replace(ampersand, 1, NEWLINE());
-          ampersand = textStr->find('&');
-        }
-
-        //insert box break
-        size_t carrotSymbol = textStr->find('^');
-        while (carrotSymbol != std::string::npos) {
-          textStr->replace(carrotSymbol, 1, INSTANT_TEXT_OFF()+WAIT_FOR_INPUT()+INSTANT_TEXT_ON());
-          carrotSymbol = textStr->find('^');
-        }
-
-        //If there's a two-way choice and only 1 newline before it in the same text box, add another one
-        size_t choice = textStr->find(TWO_WAY_CHOICE());
-        if (choice != std::string::npos) {
-          size_t newLinesCount = 0;
-          size_t lastBoxBreak = textStr->rfind(WAIT_FOR_INPUT(), choice);
-          lastNewline = choice;
-
-          if (lastBoxBreak == std::string::npos) {
-            lastBoxBreak = 0;
-          }
-
-          while ((lastNewline != std::string::npos)) {
-            lastNewline = textStr->rfind(NEWLINE(), lastNewline - 1);
-            if (lastNewline != std::string::npos && lastNewline > lastBoxBreak) {
-                newLinesCount++;
-            } else {
-                break;
-            }
-          }
-
-          if (newLinesCount <= 1) {
-              textStr->replace(choice, TWO_WAY_CHOICE().length(), NEWLINE()+TWO_WAY_CHOICE());
-          }
-        }
-
-        //add colors
-        for (auto color : colors) {
-          size_t firstHashtag = textStr->find('#');
-          if (firstHashtag != std::string::npos) {
-              textStr->replace(firstHashtag, 1, COLOR(color));
-              size_t secondHashtag = textStr->find('#');
-              if (secondHashtag == std::string::npos) {
-                //CitraPrint("ERROR: Couldn't find second '#' in " + (*textStr));
-              } else {
-                textStr->replace(secondHashtag, 1, COLOR(QM_WHITE));
-              }
-          }
-        }
-      }
-      return Text{"","",""}+UNSKIPPABLE()+INSTANT_TEXT_ON()+text+INSTANT_TEXT_OFF()+MESSAGE_END();
-    }
-
-    void ClearMessages() {
-        messageEntries.clear();
-        messageData.str("");
-    }
-
     std::string MESSAGE_END()          { return  "\x7F\x00"s; }
     std::string WAIT_FOR_INPUT()       { return  "\x7F\x01"s; }
     std::string HORIZONTAL_SPACE(uint8_t x) {
@@ -280,7 +31,7 @@ constexpr std::array DungeonColors = {
     std::string SET_SPEED(uint8_t x) {
         return "\x7F\x10"s + char(x);
     }
-    std::string SKULLTULAS_DESTROYED() { return  "\x7F\x15"s; } //RANDOTODO just refernce the versions in CustomMessage
+    std::string SKULLTULAS_DESTROYED() { return  "\x7F\x15"s; }
     std::string CURRENT_TIME()         { return  "\x7F\x17"s; }
     std::string UNSKIPPABLE()          { return  "\x7F\x19"s; }
     std::string TWO_WAY_CHOICE()       { return  "\x1B"s; }

soh/soh/Enhancements/randomizer/3drando/custom_messages.hpp

@@ -1,50 +1,11 @@
 #pragma once
 
 #include <string>
-#include <utility>
-#include <vector>
 #include <cstdint>
 
 #include "text.hpp"
 
 namespace CustomMessages {
-typedef struct {
-    // In the true file format, offset is the offset into the QM file.
-    // In randomizer, offset will be a pointer to the text in the game's address space.
-    // Since these pointers will be much larger as u32 than the original script's offsets,
-    // We will be able to distinguish between original and custom text using their numerical value.
-    const char* offset;
-    uint32_t length;
-} MessageLanguageInfo;
-
-typedef enum {
-    /* 0x00 */ JAPANESE_J,
-    /* 0x01 */ ENGLISH_U,
-    /* 0x02 */ ENGLISH_E,
-    /* 0x03 */ GERMAN_E,
-    /* 0x04 */ FRENCH_E,
-    /* 0x05 */ FRENCH_U,
-    /* 0x06 */ SPANISH_E,
-    /* 0x07 */ SPANISH_U,
-    /* 0x08 */ ITALIAN_E,
-    /* 0x09 */ DUTCH_E,
-} MessageLanguage;
-
-typedef struct {
-    uint32_t id;
-    uint32_t unk_04;
-    uint32_t unk_08;
-    uint32_t unk_0C;
-    MessageLanguageInfo info[10];
-} MessageEntry; // size = 0x60
-
-    void CreateMessage(uint32_t textId, uint32_t unk_04, uint32_t textBoxType, uint32_t textBoxPosition,
-                       std::string englishText, std::string frenchText, std::string spanishText);
-    void CreateMessageFromTextObject(uint32_t textId, uint32_t unk_04, uint32_t textBoxType, uint32_t textBoxPosition, const Text& text);
-
-    Text AddColorsAndFormat(Text text, const std::vector<uint8_t>& colors = {});
-    void ClearMessages();
-
     std::string MESSAGE_END();
     std::string WAIT_FOR_INPUT();
     std::string HORIZONTAL_SPACE(uint8_t x);

soh/soh/Enhancements/randomizer/3drando/fill.cpp

@@ -1,6 +1,5 @@
 #include "fill.hpp"
 
-#include "custom_messages.hpp"
 #include "../dungeon.h"
 #include "../context.h"
 #include "item_pool.hpp"
@@ -19,7 +18,6 @@
 #include <set>
 #include <spdlog/spdlog.h>
 
-using namespace CustomMessages;
 using namespace Rando;
 
 

soh/soh/Enhancements/randomizer/3drando/playthrough.cpp

@@ -2,7 +2,6 @@
 
 #include <libultraship/libultraship.h>
 #include <boost_custom/container_hash/hash_32.hpp>
-#include "custom_messages.hpp"
 #include "fill.hpp"
 #include "../location_access.h"
 #include "random.hpp"
@@ -23,7 +22,6 @@ int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
 
     auto ctx = Rando::Context::GetInstance();
     ctx->overrides.clear();
-    CustomMessages::ClearMessages();
     ctx->ItemReset();
     ctx->HintReset();
     ctx->GetLogic()->Reset();

soh/soh/Enhancements/randomizer/randomizer.cpp

@@ -2749,10 +2749,10 @@ CustomMessage Randomizer::GetMapGetItemMessageWithHint(GetItemEntry itemEntry) {
 }
 
 template<size_t N>
-void CreateGetItemMessages(const std::array<GetItemMessage, N>* messageEntries) {
+void CreateGetItemMessages(const std::array<GetItemMessage, N>& messageEntries) {
     CustomMessageManager* customMessageManager = CustomMessageManager::Instance;
     customMessageManager->AddCustomMessageTable(Randomizer::getItemMessageTableID);
-    for (const GetItemMessage& messageEntry : *messageEntries) {
+    for (const GetItemMessage& messageEntry : messageEntries) {
         customMessageManager->CreateGetItemMessage(
             Randomizer::getItemMessageTableID, messageEntry.giid, messageEntry.iid,
             CustomMessage(messageEntry.english, messageEntry.german, messageEntry.french, TEXTBOX_TYPE_BLUE,
@@ -3816,7 +3816,7 @@ void Randomizer::CreateCustomMessages() {
             "You found the %rDeku Nut Bag%w!&You can now hold deku nuts!",
             "Vous avez trouvé le %rSac de Noix& Mojo%w!&Vous pouvez maintenant porter des&Noix Mojo!"),
     }};
-    CreateGetItemMessages(&getItemMessages);
+    CreateGetItemMessages(getItemMessages);
     CreateRupeeMessages();
     CreateTriforcePieceMessages();
     CreateNaviRandoMessages();