mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-17 23:15:11 -05:00
Code Issues Projects Releases Wiki Activity

Uses more descriptive type name for ItemIDs for creating custom messages.

Browse Source
This commit is contained in:
Christopher Leggett 2022-08-22 19:38:30 -04:00
parent 01dbfc71ad
commit 10c05892bf
No known key found for this signature in database
GPG Key ID: 22E7784811D1BD98
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soh/soh/Enhancements/custom-message/CustomMessageManager.cpp
View File

@ -47,7 +47,7 @@ void CustomMessageManager::ReplaceColors(std::string& string) {
} }
} }
void CustomMessageManager::FormatCustomMessage(std::string& message, uint16_t iid) { void CustomMessageManager::FormatCustomMessage(std::string& message, ItemID iid) {
message.insert(0, ITEM_OBTAINED(iid)); message.insert(0, ITEM_OBTAINED(iid));
size_t start_pos = 0; size_t start_pos = 0;
std::replace(message.begin(), message.end(), '&', NEWLINE()[0]); std::replace(message.begin(), message.end(), '&', NEWLINE()[0]);
@ -81,7 +81,7 @@ bool CustomMessageManager::InsertCustomMessage(std::string tableID, uint16_t tex
return messageInsertResult.second; return messageInsertResult.second;
} }
bool CustomMessageManager::CreateGetItemMessage(std::string tableID, uint16_t giid, uint16_t iid, bool CustomMessageManager::CreateGetItemMessage(std::string tableID, uint16_t giid, ItemID iid,
CustomMessageEntry messageEntry) { CustomMessageEntry messageEntry) {
FormatCustomMessage(messageEntry.english, iid); FormatCustomMessage(messageEntry.english, iid);
FormatCustomMessage(messageEntry.german, iid); FormatCustomMessage(messageEntry.german, iid);

4
soh/soh/Enhancements/custom-message/CustomMessageManager.h
View File

@ -89,7 +89,7 @@ class CustomMessageManager {
with the provided giid (getItemID) as its key. This function also inserts the icon corresponding to with the provided giid (getItemID) as its key. This function also inserts the icon corresponding to
the provided iid (itemID) at the beginning of each page of the textbox. the provided iid (itemID) at the beginning of each page of the textbox.
*/ */
bool CreateGetItemMessage(std::string tableID, uint16_t giid, uint16_t iid, CustomMessageEntry messages); bool CreateGetItemMessage(std::string tableID, uint16_t giid, ItemID iid, CustomMessageEntry messages);
/* /*
Formats the provided Custom Message Entry and inserts it into the table with the provided tableID, Formats the provided Custom Message Entry and inserts it into the table with the provided tableID,
@ -122,7 +122,7 @@ class CustomMessageManager {
& for newline, ^ for wait-for-input, and @ for the player name, & for newline, ^ for wait-for-input, and @ for the player name,
as well as %<letter> for colors (i.e. %r for red and %w for white). as well as %<letter> for colors (i.e. %r for red and %w for white).
*/ */
void FormatCustomMessage(std::string& message, uint16_t iid); void FormatCustomMessage(std::string& message, ItemID iid);
/* /*
Replaces special characters and certain symbols with control codes Replaces special characters and certain symbols with control codes