mirror of
https://github.com/shavitush/bhoptimer.git
synced 2025-12-07 18:38:26 +00:00
fix color injections and team chat showing no clors
This commit is contained in:
parent
776cf1839a
commit
832e7b39ff
@ -517,7 +517,7 @@ public void FormatChat(int client, const char[] sMessage, bool bAlive, int iTeam
|
||||
strcopy(sFormattedText, 255, sBuffer);
|
||||
}
|
||||
|
||||
FormatEx(buffer, maxlen, "%s%s%s%s%s%s %s %s", gSG_Type == Game_CSGO? " ":"", strlen(sNewPrefix) == 0? "\x03":"", (bAlive || iTeam == CS_TEAM_SPECTATOR)? "":"*DEAD* ", sTeam, sNewPrefix, sNewName, gSG_Type == Game_CSGO? ":\x01":"\x01:", sFormattedText);
|
||||
FormatEx(buffer, maxlen, "\x01%s%s%s\x03%s%s %s %s", gSG_Type == Game_CSGO? " ":"", (bAlive || iTeam == CS_TEAM_SPECTATOR)? "":"*DEAD* ", sTeam, sNewPrefix, sNewName, gSG_Type == Game_CSGO? ":\x01":"\x01:", sFormattedText);
|
||||
}
|
||||
|
||||
public void FormatVariables(int client, char[] buffer, int maxlen, const char[] formattingrules, const char[] message)
|
||||
@ -525,18 +525,6 @@ public void FormatVariables(int client, char[] buffer, int maxlen, const char[]
|
||||
char[] sTempFormattingRules = new char[maxlen];
|
||||
strcopy(sTempFormattingRules, maxlen, formattingrules);
|
||||
|
||||
char[] sName = new char[MAX_NAME_LENGTH];
|
||||
GetClientName(client, sName, MAX_NAME_LENGTH);
|
||||
ReplaceString(sTempFormattingRules, maxlen, "{name}", sName);
|
||||
|
||||
char[] sClanTag = new char[32];
|
||||
CS_GetClientClanTag(client, sClanTag, 32);
|
||||
int iLen = strlen(sClanTag);
|
||||
sClanTag[iLen] = (iLen > 0)? ' ':'\0';
|
||||
ReplaceString(sTempFormattingRules, maxlen, "{clan}", sClanTag);
|
||||
|
||||
ReplaceString(sTempFormattingRules, maxlen, "{message}", message);
|
||||
|
||||
for(int i = 0; i < sizeof(gS_GlobalColorNames); i++)
|
||||
{
|
||||
ReplaceString(sTempFormattingRules, maxlen, gS_GlobalColorNames[i], gS_GlobalColors[i]);
|
||||
@ -556,6 +544,18 @@ public void FormatVariables(int client, char[] buffer, int maxlen, const char[]
|
||||
}
|
||||
}
|
||||
|
||||
char[] sName = new char[MAX_NAME_LENGTH];
|
||||
GetClientName(client, sName, MAX_NAME_LENGTH);
|
||||
ReplaceString(sTempFormattingRules, maxlen, "{name}", sName);
|
||||
|
||||
char[] sClanTag = new char[32];
|
||||
CS_GetClientClanTag(client, sClanTag, 32);
|
||||
int iLen = strlen(sClanTag);
|
||||
sClanTag[iLen] = (iLen > 0)? ' ':'\0';
|
||||
ReplaceString(sTempFormattingRules, maxlen, "{clan}", sClanTag);
|
||||
|
||||
ReplaceString(sTempFormattingRules, maxlen, "{message}", message);
|
||||
|
||||
strcopy(buffer, maxlen, sTempFormattingRules);
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user