add 'clantag' property (#99)

This commit is contained in:
shavitush 2016-08-04 23:04:20 +03:00
parent 141ee10e14
commit 9a040ba033
2 changed files with 38 additions and 0 deletions

View File

@ -9,6 +9,7 @@
// "prefix" - prefix before the name (don't add a space after it) // "prefix" - prefix before the name (don't add a space after it)
// "name" - custom name appearance (color from prefix will be applied here too) // "name" - custom name appearance (color from prefix will be applied here too)
// "message" - the message itself // "message" - the message itself
// "clantag" - custom clan tag
// //
// Global variables: // Global variables:
// {default} - default color // {default} - default color
@ -49,6 +50,7 @@
{ {
"prefix" "{green}/dev/" "prefix" "{green}/dev/"
"name" "{default}{team}{clan}{name}" "name" "{default}{team}{clan}{name}"
"clantag" "shave"
} }
"-1" // lookup is due, shouldn't happen unless there's some error! "-1" // lookup is due, shouldn't happen unless there's some error!

View File

@ -40,10 +40,12 @@ float gF_LastMessage[MAXPLAYERS+1];
char gS_Cached_Prefix[MAXPLAYERS+1][32]; char gS_Cached_Prefix[MAXPLAYERS+1][32];
char gS_Cached_Name[MAXPLAYERS+1][MAX_NAME_LENGTH*2]; char gS_Cached_Name[MAXPLAYERS+1][MAX_NAME_LENGTH*2];
char gS_Cached_Message[MAXPLAYERS+1][255]; char gS_Cached_Message[MAXPLAYERS+1][255];
char gS_Cached_ClanTag[MAXPLAYERS+1][32];
StringMap gSM_Custom_Prefix = null; StringMap gSM_Custom_Prefix = null;
StringMap gSM_Custom_Name = null; StringMap gSM_Custom_Name = null;
StringMap gSM_Custom_Message = null; StringMap gSM_Custom_Message = null;
StringMap gSM_Custom_ClanTag = null;
int gI_TotalChatRanks = 0; int gI_TotalChatRanks = 0;
int gI_UnassignedTitle = -1; int gI_UnassignedTitle = -1;
@ -132,6 +134,22 @@ public void OnClientPutInServer(int client)
gD_ChatRanks[0].GetString("prefix", gS_Cached_Prefix[client], 32); gD_ChatRanks[0].GetString("prefix", gS_Cached_Prefix[client], 32);
gD_ChatRanks[0].GetString("name", gS_Cached_Name[client], MAX_NAME_LENGTH*2); gD_ChatRanks[0].GetString("name", gS_Cached_Name[client], MAX_NAME_LENGTH*2);
gD_ChatRanks[0].GetString("message", gS_Cached_Message[client], 255); gD_ChatRanks[0].GetString("message", gS_Cached_Message[client], 255);
gD_ChatRanks[0].GetString("clantag", gS_Cached_ClanTag[client], 32);
UpdateClanTag(client);
}
}
public void OnClientSettingsChanged(int client)
{
UpdateClanTag(client);
}
public void UpdateClanTag(int client)
{
if(strlen(gS_Cached_ClanTag[client]) > 0)
{
CS_SetClientClanTag(client, gS_Cached_ClanTag[client]);
} }
} }
@ -192,6 +210,7 @@ public void LoadChatCache(int client)
gD_ChatRanks[iTitle].GetString("prefix", gS_Cached_Prefix[client], 32); gD_ChatRanks[iTitle].GetString("prefix", gS_Cached_Prefix[client], 32);
gD_ChatRanks[iTitle].GetString("name", gS_Cached_Name[client], MAX_NAME_LENGTH*2); gD_ChatRanks[iTitle].GetString("name", gS_Cached_Name[client], MAX_NAME_LENGTH*2);
gD_ChatRanks[iTitle].GetString("message", gS_Cached_Message[client], 255); gD_ChatRanks[iTitle].GetString("message", gS_Cached_Message[client], 255);
gD_ChatRanks[iTitle].GetString("clantag", gS_Cached_ClanTag[client], 255);
} }
else else
@ -211,6 +230,7 @@ public void LoadChatCache(int client)
gD_ChatRanks[i].GetString("prefix", gS_Cached_Prefix[client], 32); gD_ChatRanks[i].GetString("prefix", gS_Cached_Prefix[client], 32);
gD_ChatRanks[i].GetString("name", gS_Cached_Name[client], MAX_NAME_LENGTH*2); gD_ChatRanks[i].GetString("name", gS_Cached_Name[client], MAX_NAME_LENGTH*2);
gD_ChatRanks[i].GetString("message", gS_Cached_Message[client], 255); gD_ChatRanks[i].GetString("message", gS_Cached_Message[client], 255);
gD_ChatRanks[i].GetString("clantag", gS_Cached_ClanTag[client], 255);
} }
} }
} }
@ -235,6 +255,11 @@ public void LoadChatCache(int client)
{ {
strcopy(gS_Cached_Message[client], 255, sBuffer); strcopy(gS_Cached_Message[client], 255, sBuffer);
} }
if(gSM_Custom_ClanTag.GetString(sAuthID, sBuffer, 255))
{
strcopy(gS_Cached_ClanTag[client], 32, sBuffer);
}
} }
} }
@ -258,10 +283,12 @@ public void LoadConfig()
delete gSM_Custom_Prefix; delete gSM_Custom_Prefix;
delete gSM_Custom_Name; delete gSM_Custom_Name;
delete gSM_Custom_Message; delete gSM_Custom_Message;
delete gSM_Custom_ClanTag;
gSM_Custom_Prefix = new StringMap(); gSM_Custom_Prefix = new StringMap();
gSM_Custom_Name = new StringMap(); gSM_Custom_Name = new StringMap();
gSM_Custom_Message = new StringMap(); gSM_Custom_Message = new StringMap();
gSM_Custom_ClanTag = new StringMap();
ResetCache(); ResetCache();
@ -292,6 +319,9 @@ public void LoadConfig()
char[] sMessage = new char[255]; char[] sMessage = new char[255];
kvConfig.GetString("message", sMessage, 255); kvConfig.GetString("message", sMessage, 255);
char[] sClanTag = new char[32];
kvConfig.GetString("clantag", sClanTag, 32);
// custom // custom
if(StrContains(sBuffer[0], "[U:") != -1) if(StrContains(sBuffer[0], "[U:") != -1)
{ {
@ -309,6 +339,11 @@ public void LoadConfig()
{ {
gSM_Custom_Message.SetString(sBuffer, sMessage); gSM_Custom_Message.SetString(sBuffer, sMessage);
} }
if(strlen(sClanTag) > 0)
{
gSM_Custom_ClanTag.SetString(sBuffer, sClanTag);
}
} }
// ranks // ranks
@ -340,6 +375,7 @@ public void LoadConfig()
gD_ChatRanks[gI_TotalChatRanks].SetString("prefix", sPrefix, 32); gD_ChatRanks[gI_TotalChatRanks].SetString("prefix", sPrefix, 32);
gD_ChatRanks[gI_TotalChatRanks].SetString("name", (strlen(sName) > 0)? sName:"{name}", MAX_NAME_LENGTH*2); gD_ChatRanks[gI_TotalChatRanks].SetString("name", (strlen(sName) > 0)? sName:"{name}", MAX_NAME_LENGTH*2);
gD_ChatRanks[gI_TotalChatRanks].SetString("message", (strlen(sMessage) > 0)? sMessage:"{message}", 255); gD_ChatRanks[gI_TotalChatRanks].SetString("message", (strlen(sMessage) > 0)? sMessage:"{message}", 255);
gD_ChatRanks[gI_TotalChatRanks].SetString("clantag", (strlen(sClanTag) > 0)? sClanTag:"", 32);
if(iFrom == -1 && gI_UnassignedTitle == -1) if(iFrom == -1 && gI_UnassignedTitle == -1)
{ {