Skip to content

Commit b0c0ab9

Browse files
committed
Rename GetMessage() to GetMessageMap()
Rename function since GetMessage() is part of WinAPI.
1 parent 116b574 commit b0c0ab9

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Descent3/OsirisLoadandBind.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4039,5 +4039,5 @@ void Osiris_CreateModuleInitStruct(tOSIRISModuleInit *mi) {
40394039
mi->fp[122] = (int *)osipf_PathValue;
40404040
mi->fp[123] = (int *)CreateMessageMap;
40414041
mi->fp[124] = (int *)DestroyMessageMap;
4042-
mi->fp[125] = (int *)GetMessage;
4042+
mi->fp[125] = (int *)GetMessageMap;
40434043
}

Descent3/localization.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,7 @@ void DestroyMessageMap(std::map<std::string, std::string> &map) {
619619
map.clear();
620620
}
621621

622-
const char *GetMessage(const std::string &name, std::map<std::string, std::string> &map) {
622+
const char *GetMessageMap(const std::string &name, std::map<std::string, std::string> &map) {
623623
// Make sure given name is valid
624624
if (name.empty()) {
625625
return INV_MSGNAME_STRING;

Descent3/localization.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,6 @@ void DestroyMessageMap(std::map<std::string, std::string> &map);
9797
* @param map
9898
* @return return message by name, NO_MESSAGE_STRING if there no such name
9999
*/
100-
const char *GetMessage(const std::string &name, std::map<std::string, std::string> &map);
100+
const char *GetMessageMap(const std::string &name, std::map<std::string, std::string> &map);
101101

102102
#endif

0 commit comments

Comments
 (0)