Skip to content

fix line breaks in csgo #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
R1KO wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix line breaks in csgo #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/sourcemod/scripting/vip/Clients.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public void OnClientPutInServer(int iClient)
{
// g_iClientInfo[iClient] = 0;
DBG_Clients("OnClientPutInServer %N (%d): %b", iClient, iClient, g_iClientInfo[iClient])

if(!IsFakeClient(iClient) && !IsClientSourceTV(iClient))
{
Clients_CheckVipAccess(iClient, true, true);
Expand Down
53 changes: 33 additions & 20 deletions addons/sourcemod/scripting/vip/Colors.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
void Colors_Print(int iClient, const char[] szFormat)
{
char szMessage[512];
char szMessage[1024];
FormatEx(SZF(szMessage), g_EngineVersion == Engine_CSGO ? " \x01%t %s":"\x01%t %s", "VIP_CHAT_PREFIX", szFormat);

ReplaceString(SZF(szMessage), "\\n", "\n");
Expand All @@ -9,21 +9,18 @@ void Colors_Print(int iClient, const char[] szFormat)

switch (g_EngineVersion)
{
case Engine_SourceSDK2006, Engine_Left4Dead, Engine_Left4Dead2:
case Engine_SourceSDK2006, Engine_Left4Dead, Engine_Left4Dead2:
{
ReplaceString(SZF(szMessage), "{LIGHTGREEN}", "\x03");
int iColor = Colors_ReplaceColors(SZF(szMessage));
switch (iColor)
{
case -1: Colors_SayText2(iClient, 0, szMessage);
case 0: Colors_SayText2(iClient, iClient, szMessage);
default:
{
Colors_SayText2(iClient, Colors_FindPlayerByTeam(iColor), szMessage);
}
case -1: Colors_SayText2(iClient, 0, szMessage);
case 0: Colors_SayText2(iClient, iClient, szMessage);
default: Colors_SayText2(iClient, Colors_FindPlayerByTeam(iColor), szMessage);
}
}
case Engine_CSS, Engine_TF2, Engine_DODS, Engine_HL2DM:
case Engine_CSS, Engine_TF2, Engine_DODS, Engine_HL2DM:
{
ReplaceString(SZF(szMessage), "#", "\x07");
if (ReplaceString(SZF(szMessage), "{TEAM}", "\x03"))
Expand All @@ -36,7 +33,7 @@ void Colors_Print(int iClient, const char[] szFormat)
Colors_SayText2(iClient, 0, szMessage);
}
}
case Engine_CSGO:
case Engine_CSGO:
{
static const char szColorName[][] =
{
Expand Down Expand Up @@ -69,30 +66,45 @@ void Colors_Print(int iClient, const char[] szFormat)
{
ReplaceString(SZF(szMessage), szColorName[i], szColorCode[i]);
}


int iSender = 0, iLastStart = 0, i = 0;
if (ReplaceString(SZF(szMessage), "{TEAM}", "\x03"))
{
Colors_SayText2(iClient, iClient, szMessage);
iSender = iClient;
}
else

char szText[512];
while(szMessage[i])
{
Colors_SayText2(iClient, 0, szMessage);
if (szMessage[i] == '\n')
{
szMessage[i] = 0;
FormatEx(SZF(szText), " %s", szMessage[iLastStart]);
Colors_SayText2(iClient, iSender, szText);
iLastStart = i+1;
}

i++;
}

FormatEx(SZF(szText), " %s", szMessage[iLastStart]);
Colors_SayText2(iClient, iSender, szText);
}
default:
default:
{
ReplaceString(SZF(szMessage), "{TEAM}", "\x03");
PrintToChat(iClient, szMessage);
}
}
}

int Colors_ReplaceColors(char[] sMsg, int MaxLength)
{
if (ReplaceString(sMsg, MaxLength, "{TEAM}", "\x03"))return 0;
if (ReplaceString(sMsg, MaxLength, "{TEAM}", "\x03")) return 0;

if (ReplaceString(sMsg, MaxLength, "{BLUE}", "\x03"))return 3;
if (ReplaceString(sMsg, MaxLength, "{RED}", "\x03"))return 2;
if (ReplaceString(sMsg, MaxLength, "{GRAY}", "\x03"))return 1;
if (ReplaceString(sMsg, MaxLength, "{BLUE}", "\x03")) return 3;
if (ReplaceString(sMsg, MaxLength, "{RED}", "\x03")) return 2;
if (ReplaceString(sMsg, MaxLength, "{GRAY}", "\x03")) return 1;

return -1;
}
Expand All @@ -101,7 +113,8 @@ int Colors_FindPlayerByTeam(int iTeam)
{
for (int i = 1; i <= MaxClients; i++)
{
if (IsClientInGame(i) && GetClientTeam(i) == iTeam)return i;
if (IsClientInGame(i) && GetClientTeam(i) == iTeam)
return i;
}

return 0;
Expand Down
8 changes: 8 additions & 0 deletions addons/sourcemod/scripting/vip/Debug.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ void DebugMsg(const char[] sMsg, any ...)
// #define LOG_FEATURES // FEATURES
// #define LOG_CLIENTS // CLIENTS
// #define LOG_DB // DB
// #define LOG_INFO // INFO

#else
#define DebugMessage(%0)
Expand Down Expand Up @@ -65,3 +66,10 @@ void DebugMsg(const char[] sMsg, any ...)
#else
#define DBG_Database(%0)
#endif


#if defined LOG_INFO
#define DBG_Info(%0) DebugMsg("Info: " ... %0);
#else
#define DBG_Info(%0)
#endif
Loading