github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-26 16:15:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix some errors with skull tokens and apply icon

Browse source
This commit is contained in:
Christopher Leggett 2025-02-27 16:38:23 -05:00
commit faa21513c4
No known key found for this signature in database
GPG key ID: F2121C0AF9938ABF
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
soh/soh/Enhancements/InjectItemCounts.cpp
View file

@ -28,14 +28,15 @@ void BuildSkulltulaMessage(uint16_t* textId, bool* loadFromMessageTable) {
} }
int16_t gsCount = gSaveContext.inventory.gsTokens + (IS_RANDO ? 1 : 0); int16_t gsCount = gSaveContext.inventory.gsTokens + (IS_RANDO ? 1 : 0);
msg.Replace("[[gscount]]", std::to_string(gsCount)); msg.Replace("[[gscount]]", std::to_string(gsCount));
msg.AutoFormat(ITEM_SKULL_TOKEN);
msg.AutoFormat(); msg.AutoFormat();
msg.LoadIntoFont(); msg.LoadIntoFont();
*loadFromMessageTable = false; *loadFromMessageTable = false;
} }
void InjectItemCounts_Register() { void InjectItemCounts_Register() {
COND_ID_HOOK(OnOpenText, TEXT_GS_FREEZE, CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), BuildSkulltulaMessage); COND_ID_HOOK(OnOpenText, TEXT_GS_FREEZE, CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), 0), BuildSkulltulaMessage);
COND_ID_HOOK(OnOpenText, TEXT_GS_NO_FREEZE, CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), BuildSkulltulaMessage); COND_ID_HOOK(OnOpenText, TEXT_GS_NO_FREEZE, CVarGetInteger(CVAR_ENHANCEMENT("InjectItemCounts.GoldSkulltula"), 0), BuildSkulltulaMessage);
} }
RegisterShipInitFunc initFunc(InjectItemCounts_Register, { RegisterShipInitFunc initFunc(InjectItemCounts_Register, {