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

Replaces string literal for BaseGameOverrides with const variable.

Browse Source
This commit is contained in:
Christopher Leggett 2022-08-01 23:16:16 -04:00
parent 480053dfaa
commit bb8152b376
No known key found for this signature in database
GPG Key ID: 7093AE5FF7037D79
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/OTRGlobals.cpp
View File

@ -1518,7 +1518,7 @@ extern "C" int CustomMessage_RetrieveIfExists(GlobalContext* globalCtx) {
} else { } else {
textId = TEXT_GS_FREEZE; textId = TEXT_GS_FREEZE;
} }
messageEntry = CustomMessageManager::Instance->RetrieveMessage("BaseGameOverrides", textId); messageEntry = CustomMessageManager::Instance->RetrieveMessage(customMessageTableID, textId);
} }
} }
if (messageEntry.textBoxType != -1) { if (messageEntry.textBoxType != -1) {

2
soh/soh/OTRGlobals.h
View File

@ -10,6 +10,8 @@
#include "Enhancements/savestates.h" #include "Enhancements/savestates.h"
#include "Enhancements/randomizer/randomizer.h" #include "Enhancements/randomizer/randomizer.h"
const std::string customMessageTableID = "BaseGameOverrides";
class OTRGlobals class OTRGlobals
{ {
public: public:

2
soh/soh/z_message_OTR.cpp
View File

@ -15,8 +15,6 @@ extern "C" MessageTableEntry* sFraMessageEntryTablePtr;
extern "C" MessageTableEntry* sStaffMessageEntryTablePtr; extern "C" MessageTableEntry* sStaffMessageEntryTablePtr;
//extern "C" MessageTableEntry* _message_0xFFFC_nes; //extern "C" MessageTableEntry* _message_0xFFFC_nes;
const std::string customMessageTableID = "BaseGameOverrides";
MessageTableEntry* OTRMessage_LoadTable(const char* filePath, bool isNES) { MessageTableEntry* OTRMessage_LoadTable(const char* filePath, bool isNES) {
auto file = std::static_pointer_cast<Ship::Text>(OTRGlobals::Instance->context->GetResourceManager()->LoadResource(filePath)); auto file = std::static_pointer_cast<Ship::Text>(OTRGlobals::Instance->context->GetResourceManager()->LoadResource(filePath));