Skip to content

Commit

Permalink
Rename GetMessage() to GetMessageMap()
Browse files Browse the repository at this point in the history
Rename function since GetMessage() is part of WinAPI.
  • Loading branch information
winterheart committed Aug 22, 2024
1 parent a012010 commit a6a897b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Descent3/OsirisLoadandBind.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4038,5 +4038,5 @@ void Osiris_CreateModuleInitStruct(tOSIRISModuleInit *mi) {
mi->fp[122] = (int *)osipf_PathValue;
mi->fp[123] = (int *)CreateMessageMap;
mi->fp[124] = (int *)DestroyMessageMap;
mi->fp[125] = (int *)GetMessage;
mi->fp[125] = (int *)GetMessageMap;
}
2 changes: 1 addition & 1 deletion Descent3/localization.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@ void DestroyMessageMap(std::map<std::string, std::string> &map) {
map.clear();
}

const char *GetMessage(const std::string &name, std::map<std::string, std::string> &map) {
const char *GetMessageMap(const std::string &name, std::map<std::string, std::string> &map) {
// Make sure given name is valid
if (name.empty()) {
return INV_MSGNAME_STRING;
Expand Down
2 changes: 1 addition & 1 deletion Descent3/localization.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,6 @@ void DestroyMessageMap(std::map<std::string, std::string> &map);
* @param map
* @return return message by name, NO_MESSAGE_STRING if there no such name
*/
const char *GetMessage(const std::string &name, std::map<std::string, std::string> &map);
const char *GetMessageMap(const std::string &name, std::map<std::string, std::string> &map);

#endif

0 comments on commit a6a897b

Please sign in to comment.