Skip to content

Commit b141da6

Browse files
MiranDMCMiranDMC
committed
CMessages fixes
1 parent afed44a commit b141da6

7 files changed

Lines changed: 330 additions & 244 deletions

File tree

‎plugin_III/game_III/CMessages.cpp‎

Lines changed: 88 additions & 90 deletions
Large diffs are not rendered by default.

‎plugin_III/game_III/CMessages.h‎

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -44,49 +44,50 @@ class CMessages {
4444
static tBigMessage *BIGMessages; // static BigMessage BIGMessages[6];
4545

4646
static void Init();
47-
static int GetWideStringLength(wchar_t* str);
48-
static int WideStringCopy(wchar_t* dst, wchar_t* src, unsigned short size);
49-
static bool WideStringCompare(wchar_t* str1, wchar_t* str2, unsigned short size);
47+
static int GetWideStringLength(const wchar_t* str);
48+
static int WideStringCopy(wchar_t* dst, const wchar_t* src, unsigned short size);
49+
static bool WideStringCompare(const wchar_t* str1, const wchar_t* str2, unsigned short size);
5050
static void Process();
5151
static void Display();
52-
static void AddMessage(wchar_t* text, unsigned int time, unsigned short flag);
53-
static void AddMessageJumpQ(wchar_t* text, unsigned int time, unsigned short flag);
54-
static void AddMessageSoon(wchar_t* text, unsigned int time, unsigned short flag);
52+
static void AddMessage(const wchar_t* text, unsigned int time, unsigned short flag);
53+
static void AddMessageJumpQ(const wchar_t* text, unsigned int time, unsigned short flag);
54+
static void AddMessageSoon(const wchar_t* text, unsigned int time, unsigned short flag);
5555
static void ClearMessages();
5656
static void ClearSmallMessagesOnly();
57-
static void AddBigMessage(wchar_t* text, unsigned int time, unsigned short flag);
58-
static void AddBigMessageQ(wchar_t* text, unsigned int time, unsigned short flag);
59-
static void AddToPreviousBriefArray(wchar_t* text, int n1, int n2, int n3, int n4, int n5, int n6, wchar_t* str);
60-
static void InsertNumberInString(wchar_t* src, int n1, int n2, int n3, int n4, int n5, int n6, wchar_t* dst);
57+
static void AddBigMessage(const wchar_t* text, unsigned int time, unsigned short flag);
58+
static void AddBigMessageQ(const wchar_t* text, unsigned int time, unsigned short flag);
59+
static void AddToPreviousBriefArray(const wchar_t* text, int n1, int n2, int n3, int n4, int n5, int n6, const wchar_t* str);
60+
static void InsertNumberInString(const wchar_t* src, int n1, int n2, int n3, int n4, int n5, int n6, wchar_t* dst);
6161
static void InsertStringInString(wchar_t* text, wchar_t* str);
62-
static void InsertPlayerControlKeysInString(wchar_t* text);
63-
static void AddMessageWithNumber(wchar_t* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
64-
static void AddMessageJumpQWithNumber(wchar_t* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
65-
static void AddMessageSoonWithNumber(wchar_t* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
66-
static void AddBigMessageWithNumber(wchar_t* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
67-
static void AddBigMessageWithNumberQ(wchar_t* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
68-
static void AddMessageWithString(wchar_t* text, unsigned int time, unsigned short flag, wchar_t* str);
69-
static void AddMessageJumpQWithString(wchar_t* text, unsigned int time, unsigned short flag, wchar_t* str);
70-
static void ClearThisPrint(wchar_t* text);
71-
static void ClearThisBigPrint(wchar_t* text);
62+
static void InsertPlayerControlKeysInString(const wchar_t* text);
63+
static void AddMessageWithNumber(const wchar_t* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
64+
static void AddMessageJumpQWithNumber(const wchar_t* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
65+
static void AddMessageSoonWithNumber(const wchar_t* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
66+
static void AddBigMessageWithNumber(const wchar_t* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
67+
static void AddBigMessageWithNumberQ(const wchar_t* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
68+
static void AddMessageWithString(const wchar_t* text, unsigned int time, unsigned short flag, const wchar_t* str);
69+
static void AddMessageJumpQWithString(const wchar_t* text, unsigned int time, unsigned short flag, const wchar_t* str);
70+
static void ClearThisPrint(const wchar_t* text);
71+
static void ClearThisBigPrint(const wchar_t* text);
7272
static void ClearAllMessagesDisplayedByGame();
7373

74-
static void AddMessage(char* text, unsigned int time, unsigned short flag);
75-
static void AddMessageJumpQ(char* text, unsigned int time, unsigned short flag);
76-
static void AddMessageSoon(char* text, unsigned int time, unsigned short flag);
77-
static void AddBigMessage(char* text, unsigned int time, unsigned short flag);
78-
static void AddBigMessageQ(char* text, unsigned int time, unsigned short flag);
79-
static void AddToPreviousBriefArray(char* text, int n1, int n2, int n3, int n4, int n5, int n6, char* str);
80-
static void InsertNumberInString(char* src, int n1, int n2, int n3, int n4, int n5, int n6, char* dst);
81-
static void InsertStringInString(char* text, char* str);
74+
// automatic conversion to wide characters
75+
static void AddMessage(const char* text, unsigned int time, unsigned short flag);
76+
static void AddMessageJumpQ(const char* text, unsigned int time, unsigned short flag);
77+
static void AddMessageSoon(const char* text, unsigned int time, unsigned short flag);
78+
static void AddBigMessage(const char* text, unsigned int time, unsigned short flag);
79+
static void AddBigMessageQ(const char* text, unsigned int time, unsigned short flag);
80+
static void AddToPreviousBriefArray(const char* text, int n1, int n2, int n3, int n4, int n5, int n6, const char* str);
81+
static void InsertNumberInString(const char* src, int n1, int n2, int n3, int n4, int n5, int n6, char* dst);
82+
static void InsertStringInString(char* text, const char* str);
8283
static void InsertPlayerControlKeysInString(char* text);
83-
static void AddMessageWithNumber(char* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
84-
static void AddMessageJumpQWithNumber(char* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
85-
static void AddMessageSoonWithNumber(char* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
86-
static void AddBigMessageWithNumber(char* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
87-
static void AddBigMessageWithNumberQ(char* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
88-
static void AddMessageWithString(char* text, unsigned int time, unsigned short flag, char* str);
89-
static void AddMessageJumpQWithString(char* text, unsigned int time, unsigned short flag, char* str);
90-
static void ClearThisPrint(char* text);
91-
static void ClearThisBigPrint(char* text);
84+
static void AddMessageWithNumber(const char* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
85+
static void AddMessageJumpQWithNumber(const char* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
86+
static void AddMessageSoonWithNumber(const char* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
87+
static void AddBigMessageWithNumber(const char* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
88+
static void AddBigMessageWithNumberQ(const char* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6);
89+
static void AddMessageWithString(const char* text, unsigned int time, unsigned short flag, const char* str);
90+
static void AddMessageJumpQWithString(const char* text, unsigned int time, unsigned short flag, const char* str);
91+
static void ClearThisPrint(const char* text);
92+
static void ClearThisBigPrint(const char* text);
9293
};

‎plugin_sa/game_sa/CMessages.cpp‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -45,26 +45,26 @@ tMessage *CMessages::BriefMessages = (tMessage *)0xC1A7F0;
4545
tBigMessage *CMessages::BIGMessages = (tBigMessage *)0xC1A970;
4646

4747
// Returns length of a string
48-
unsigned int CMessages::GetStringLength(char *string)
48+
unsigned int CMessages::GetStringLength(const char* text)
4949
{
50-
return ((unsigned int (__cdecl *)(char *))FUNC_CMessages__GetStringLength)(string);
50+
return ((unsigned int (__cdecl *)(const char*))FUNC_CMessages__GetStringLength)(text);
5151
}
5252

5353
// Copies string src to dest
54-
void CMessages::StringCopy(char *dest, char *src, unsigned short len)
54+
void CMessages::StringCopy(char* dest, const char* src, unsigned short len)
5555
{
56-
((void (__cdecl *)(char *, char *, unsigned short))FUNC_CMessages__StringCopy)(dest, src, len);
56+
((void (__cdecl *)(char*, const char*, unsigned short))FUNC_CMessages__StringCopy)(dest, src, len);
5757
}
5858

5959
// Compares 2 strings
60-
unsigned char CMessages::StringCompare(char *str1, char *str2, unsigned short len)
60+
unsigned char CMessages::StringCompare(const char* str1, const char* str2, unsigned short len)
6161
{
62-
return ((unsigned char (__cdecl *)(char *, char *, unsigned short))FUNC_CMessages__StringCompare)(str1, str2, len);
62+
return ((unsigned char (__cdecl *)(const char*, const char*, unsigned short))FUNC_CMessages__StringCompare)(str1, str2, len);
6363
}
6464

65-
void CMessages::CutString(int count, char *str, char **dest)
65+
void CMessages::CutString(int count, const char* str, char** dest)
6666
{
67-
((void (__cdecl *)(int, char *, char **))FUNC_CMessages__CutString)(count, str, dest);
67+
((void (__cdecl *)(int, const char*, char**))FUNC_CMessages__CutString)(count, str, dest);
6868
}
6969

7070
// Removes registered messages
@@ -80,9 +80,9 @@ void CMessages::ClearSmallMessagesOnly()
8080
}
8181

8282
// Adds message to previous brief
83-
void CMessages::AddToPreviousBriefArray(char *text, int n1, int n2, int n3, int n4, int n5, int n6, char *string)
83+
void CMessages::AddToPreviousBriefArray(const char* text, int n1, int n2, int n3, int n4, int n5, int n6, const char* string)
8484
{
85-
((void (__cdecl *)(char *, int, int, int, int, int, int, char *))FUNC_CMessages__AddToPreviousBriefArray)(text, n1, n2, n3, n4, n5, n6, string);
85+
((void (__cdecl *)(const char*, int, int, int, int, int, int, const char*))FUNC_CMessages__AddToPreviousBriefArray)(text, n1, n2, n3, n4, n5, n6, string);
8686
}
8787

8888
// Removes messages from previous brief
@@ -92,69 +92,69 @@ void CMessages::ClearPreviousBriefArray()
9292
}
9393

9494
// Inserts numbers into string
95-
void CMessages::InsertNumberInString(char *src, int n1, int n2, int n3, int n4, int n5, int n6, char *dst)
95+
void CMessages::InsertNumberInString(const char* src, int n1, int n2, int n3, int n4, int n5, int n6, char* dst)
9696
{
97-
((void (__cdecl *)(char *, int, int, int, int, int, int, char *))FUNC_CMessages__InsertNumberInString)(src, n1, n2, n3, n4, n5, n6, dst);
97+
((void (__cdecl *)(const char*, int, int, int, int, int, int, const char*))FUNC_CMessages__InsertNumberInString)(src, n1, n2, n3, n4, n5, n6, dst);
9898
}
9999

100100
// Inserts string into src
101-
void CMessages::InsertStringInString(char *src, char *string)
101+
void CMessages::InsertStringInString(char* text, const char* string)
102102
{
103-
((void (__cdecl *)(char *, char *))FUNC_CMessages__InsertStringInString)(src, string);
103+
((void (__cdecl *)(char*, const char*))FUNC_CMessages__InsertStringInString)(text, string);
104104
}
105105

106106
// Inserts key events into string
107-
void CMessages::InsertPlayerControlKeysInString(char *string)
107+
void CMessages::InsertPlayerControlKeysInString(char* string)
108108
{
109-
((void (__cdecl *)(char *))FUNC_CMessages__InsertPlayerControlKeysInString)(string);
109+
((void (__cdecl *)(char*))FUNC_CMessages__InsertPlayerControlKeysInString)(string);
110110
}
111111

112112
// Adds message with numbers to queue
113-
void CMessages::AddMessageWithNumber(char *text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6, bool bPreviousBrief)
113+
void CMessages::AddMessageWithNumber(const char* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6, bool bPreviousBrief)
114114
{
115-
((void (__cdecl *)(char *, unsigned int, unsigned short, int, int, int, int, int, int, bool))FUNC_CMessages__AddMessageWithNumber)(text, time, flag, n1, n2, n3, n4, n5, n6, bPreviousBrief);
115+
((void (__cdecl *)(const char*, unsigned int, unsigned short, int, int, int, int, int, int, bool))FUNC_CMessages__AddMessageWithNumber)(text, time, flag, n1, n2, n3, n4, n5, n6, bPreviousBrief);
116116
}
117117

118118
// Adds message with numbers and shows it instantly
119-
void CMessages::AddMessageJumpQWithNumber(char *text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6, bool bPreviousBrief)
119+
void CMessages::AddMessageJumpQWithNumber(const char* text, unsigned int time, unsigned short flag, int n1, int n2, int n3, int n4, int n5, int n6, bool bPreviousBrief)
120120
{
121-
((void (__cdecl *)(char *, unsigned int, unsigned short, int, int, int, int, int, int, bool))FUNC_CMessages__AddMessageJumpQWithNumber)(text, time, flag, n1, n2, n3, n4, n5, n6, bPreviousBrief);
121+
((void (__cdecl *)(const char*, unsigned int, unsigned short, int, int, int, int, int, int, bool))FUNC_CMessages__AddMessageJumpQWithNumber)(text, time, flag, n1, n2, n3, n4, n5, n6, bPreviousBrief);
122122
}
123123

124124
// Adds big message with numbers and shows it instantly , see eMessageStyle
125-
void CMessages::AddBigMessageWithNumber(char *text, unsigned int time, unsigned short style, int n1, int n2, int n3, int n4, int n5, int n6)
125+
void CMessages::AddBigMessageWithNumber(const char* text, unsigned int time, unsigned short style, int n1, int n2, int n3, int n4, int n5, int n6)
126126
{
127-
((void (__cdecl *)(char *, unsigned int, unsigned short, int, int, int, int, int, int))FUNC_CMessages__AddBigMessageWithNumber)(text, time, style, n1, n2, n3, n4, n5, n6);
127+
((void (__cdecl *)(const char*, unsigned int, unsigned short, int, int, int, int, int, int))FUNC_CMessages__AddBigMessageWithNumber)(text, time, style, n1, n2, n3, n4, n5, n6);
128128
}
129129

130130
// Adds big message with numbers to queue , see eMessageStyle
131-
void CMessages::AddBigMessageWithNumberQ(char *text, unsigned int time, unsigned short style, int n1, int n2, int n3, int n4, int n5, int n6)
131+
void CMessages::AddBigMessageWithNumberQ(const char* text, unsigned int time, unsigned short style, int n1, int n2, int n3, int n4, int n5, int n6)
132132
{
133-
((void (__cdecl *)(char *, unsigned int, unsigned short, int, int, int, int, int, int))FUNC_CMessages__AddBigMessageWithNumberQ)(text, time, style, n1, n2, n3, n4, n5, n6);
133+
((void (__cdecl *)(const char*, unsigned int, unsigned short, int, int, int, int, int, int))FUNC_CMessages__AddBigMessageWithNumberQ)(text, time, style, n1, n2, n3, n4, n5, n6);
134134
}
135135

136136
// Adds message with string to queue
137-
void CMessages::AddMessageWithString(char *text, unsigned int time, unsigned short flag, char *string, char bPreviousBrief)
137+
void CMessages::AddMessageWithString(const char* text, unsigned int time, unsigned short flag, char* string, char bPreviousBrief)
138138
{
139-
((void (__cdecl *)(char *, unsigned int, unsigned short, char *, char))FUNC_CMessages__AddMessageWithString)(text, time, flag, string, bPreviousBrief);
139+
((void (__cdecl *)(const char*, unsigned int, unsigned short, char*, char))FUNC_CMessages__AddMessageWithString)(text, time, flag, string, bPreviousBrief);
140140
}
141141

142142
// Adds message with string and shows it instantly
143-
void CMessages::AddMessageJumpQWithString(char *text, unsigned int time, unsigned short flag, char *string, char bPreviousBrief)
143+
void CMessages::AddMessageJumpQWithString(const char* text, unsigned int time, unsigned short flag, char* string, char bPreviousBrief)
144144
{
145-
((void (__cdecl *)(char *, unsigned int, unsigned short, char *, char))FUNC_CMessages__AddMessageJumpQWithString)(text, time, flag, string, bPreviousBrief);
145+
((void (__cdecl *)(const char*, unsigned int, unsigned short, char*, char))FUNC_CMessages__AddMessageJumpQWithString)(text, time, flag, string, bPreviousBrief);
146146
}
147147

148148
// Removes small message with this text
149-
void CMessages::ClearThisPrint(char *text)
149+
void CMessages::ClearThisPrint(const char* text)
150150
{
151-
((void (__cdecl *)(char *))FUNC_CMessages__ClearThisPrint)(text);
151+
((void (__cdecl *)(const char*))FUNC_CMessages__ClearThisPrint)(text);
152152
}
153153

154154
// Removes big message with this text
155-
void CMessages::ClearThisBigPrint(char *text)
155+
void CMessages::ClearThisBigPrint(const char* text)
156156
{
157-
((void (__cdecl *)(char *))FUNC_CMessages__ClearThisBigPrint)(text);
157+
((void (__cdecl *)(const char*))FUNC_CMessages__ClearThisBigPrint)(text);
158158
}
159159

160160
// Removes first big message in messages stack , see eMessageStyle
@@ -188,25 +188,25 @@ void CMessages::Display(bool flag)
188188
}
189189

190190
// Adds message to queue
191-
void CMessages::AddMessage(char *text, unsigned int time, unsigned short flag, bool bPreviousBrief)
191+
void CMessages::AddMessage(const char* text, unsigned int time, unsigned short flag, bool bPreviousBrief)
192192
{
193-
((void (__cdecl *)(char *, unsigned int, unsigned short, bool))FUNC_CMessages__AddMessage)(text, time, flag, bPreviousBrief);
193+
((void (__cdecl *)(const char*, unsigned int, unsigned short, bool))FUNC_CMessages__AddMessage)(text, time, flag, bPreviousBrief);
194194
}
195195

196196
// Adds message and shows it instantly
197-
void CMessages::AddMessageJumpQ(char *text, unsigned int time, unsigned short flag, bool bPreviousBrief)
197+
void CMessages::AddMessageJumpQ(const char* text, unsigned int time, unsigned short flag, bool bPreviousBrief)
198198
{
199-
((void (__cdecl *)(char *, unsigned int, unsigned short, bool))FUNC_CMessages__AddMessageJumpQ)(text, time, flag, bPreviousBrief);
199+
((void (__cdecl *)(const char*, unsigned int, unsigned short, bool))FUNC_CMessages__AddMessageJumpQ)(text, time, flag, bPreviousBrief);
200200
}
201201

202202
// Adds big message and shows it instantly , see eMessageStyle
203-
void CMessages::AddBigMessage(char *text, unsigned int time, unsigned short style)
203+
void CMessages::AddBigMessage(const char* text, unsigned int time, unsigned short style)
204204
{
205-
((void (__cdecl *)(char *, unsigned int, unsigned short))FUNC_CMessages__AddBigMessage)(text, time, style);
205+
((void (__cdecl *)(const char*, unsigned int, unsigned short))FUNC_CMessages__AddBigMessage)(text, time, style);
206206
}
207207

208208
// Adds big message to queue , see eMessageStyle
209-
void CMessages::AddBigMessageQ(char *text, unsigned int time, unsigned short style)
209+
void CMessages::AddBigMessageQ(const char* text, unsigned int time, unsigned short style)
210210
{
211-
((void (__cdecl *)(char *, unsigned int, unsigned short))FUNC_CMessages__AddBigMessageQ)(text, time, style);
211+
((void (__cdecl *)(const char*, unsigned int, unsigned short))FUNC_CMessages__AddBigMessageQ)(text, time, style);
212212
}

0 commit comments

Comments
 (0)