sm-plugins/bhoptimer
1
0
Fork 0
mirror of https://github.com/shavitush/bhoptimer.git synced 2025-12-15 18:18:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source 
Conflicts:
	scripting/shavit-hud.sp
	scripting/shavit-misc.sp
This commit is contained in:
Shavitush 2015-07-27 23:02:42 +03:00
commit 4401dd1f01
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripting/shavit-hud.sp
View File

@ -49,7 +49,11 @@ public void OnConfigsExecuted()
{
if(gSG_Type == Game_CSS)
{
<<<<<<< HEAD
FindConVar("sv_hudhint_sound 0").SetBool(false);
=======
ServerCommand("sv_hudhint_sound 0");
>>>>>>> 7fd745e1f394b7bc1781d815f373af6662d505a2
}
}
@ -151,9 +155,13 @@ public void UpdateHUD(int client)
{
Format(sHintText, 256, "%s\tJumps: %d", sHintText, iJumps);
}
Format(sHintText, 256, "%s\nStyle: <font color='%s</font>", sHintText, bsStyle == Style_Forwards? "#797FD4'>Forwards":"#B54CB3'>Sideways");
if(!bSpectating)
{
Format(sHintText, 256, "%s\tPlayer: <font color='#BF6821'>%N</font>", sHintText, target);
if(!bSpectating)
{
Format(sHintText, 256, "%s\tPlayer: <font color='#BF6821'>%N</font>", sHintText, target);
@ -194,7 +202,7 @@ public void UpdateHUD(int client)
if(!bSpectating)
{
Format(sHintText, 256, "%s\tPlayer: %N", sHintText, target);
Format(sHintText, 256 "%s\tPlayer: %N", sHintText, target);
}
}

6
scripting/shavit-misc.sp
View File

@ -380,7 +380,7 @@ public Action Command_Specs(int client, int args)
}
int iCount;
char sSpecs[256];
char sSpecs[192];
for(int i = 1; i <= MaxClients; i++)
{
@ -395,12 +395,12 @@ public Action Command_Specs(int client, int args)
if(iCount == 1)
{
FormatEx(sSpecs, 256, "%N", i);
FormatEx(sSpecs, 192, "%N", i);
}
else
{
Format(sSpecs, 256, "%s, %N", sSpecs, i);
Format(sSpecs, 192, "%s, %N", sSpecs, i);
}
}
}