github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 22:33:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix post-merge build errros

Browse source
This commit is contained in:
Christopher Leggett 2025-04-29 19:34:03 -04:00
commit adaf245dc3
No known key found for this signature in database
GPG key ID: F2121C0AF9938ABF
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
View file

@ -443,6 +443,13 @@ static size_t NextLineLength(const std::string* textStr, const size_t lastNewlin
nextPosJump = 1; nextPosJump = 1;
} }
} }
currentPos += nextPosJump;
}
// return the total number of characters we looped through
if (totalPixelWidth > maxLinePixelWidth && textStr->at(currentPos - nextPosJump) != ' ') {
return currentPos - lastNewline - nextPosJump;
} else {
return currentPos - lastNewline;
} }
} }

1
soh/soh/Enhancements/custom-message/CustomMessageManager.h
View file

@ -62,7 +62,6 @@ class CustomMessage {
static std::string PLAYER_NAME(); static std::string PLAYER_NAME();
static std::string TWO_WAY_CHOICE(); static std::string TWO_WAY_CHOICE();
CustomMessage LoadVanillaMessageTableEntry(uint16_t textId);
const std::string GetEnglish(MessageFormat format = MF_FORMATTED) const; const std::string GetEnglish(MessageFormat format = MF_FORMATTED) const;
const std::string GetFrench(MessageFormat format = MF_FORMATTED) const; const std::string GetFrench(MessageFormat format = MF_FORMATTED) const;
const std::string GetGerman(MessageFormat format = MF_FORMATTED) const; const std::string GetGerman(MessageFormat format = MF_FORMATTED) const;

6
soh/soh/Enhancements/randomizer/static_data.cpp
View file

@ -86,12 +86,6 @@ std::unordered_map<uint32_t, CustomMessage> StaticData::hintNames = {
{ RH_BIGGORON_HINT, CustomMessage("Biggoron Claim Check Hint") }, { RH_BIGGORON_HINT, CustomMessage("Biggoron Claim Check Hint") },
{ RH_FROGS_HINT, CustomMessage("Final Frogs in River Hint") }, { RH_FROGS_HINT, CustomMessage("Final Frogs in River Hint") },
{ RH_OOT_HINT, CustomMessage("Sheik in Temple of Time Hint") }, { RH_OOT_HINT, CustomMessage("Sheik in Temple of Time Hint") },
{ RH_KAK_10_SKULLS_HINT, CustomMessage("10 Skulls Hint") },
{ RH_KAK_20_SKULLS_HINT, CustomMessage("20 Skulls Hint") },
{ RH_KAK_30_SKULLS_HINT, CustomMessage("30 Skulls Hint") },
{ RH_KAK_40_SKULLS_HINT, CustomMessage("40 Skulls Hint") },
{ RH_KAK_50_SKULLS_HINT, CustomMessage("50 Skulls Hint") },
{ RH_KAK_100_SKULLS_HINT, CustomMessage("100 Skulls Hint") },
{ RH_MASK_SHOP_HINT, CustomMessage("Mask Shop Hint") }, { RH_MASK_SHOP_HINT, CustomMessage("Mask Shop Hint") },
}; };