kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1137 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2007-06-04 21:37:40 +00:00
parent 8929980cc5
commit a2476bf408
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+9 -9
View File
@@ -47,13 +47,13 @@ bool duplicatename(playerent *d, char *name = NULL)
return false;
}
char *colorname(playerent *d, char *name, char *prefix)
char *colorname(playerent *d, int num, char *name, char *prefix)
{
if(!name) name = d->name;
if(name[0] && !duplicatename(d, name)) return name;
static string cname;
s_sprintf(cname)("%s%s \fs\f5(%d)\fr", prefix, name, d->clientnum);
return cname;
static string cname[4];
s_sprintf(cname[num])("%s%s \fs\f5(%d)\fr", prefix, name, d->clientnum);
return cname[num];
}
void newname(char *name)
@@ -578,21 +578,21 @@ void flagmsg(int flag, int action)
{
playsound(S_FLAGPICKUP);
if(f.actor==player1) conoutf("\f2you got the enemy flag");
else conoutf("\f2%s got %s flag", f.actor->name, (own ? "your": "the enemy"));
else conoutf("\f2%s got %s flag", colorname(f.actor), (own ? "your": "the enemy"));
break;
}
case SV_FLAGDROP:
{
playsound(S_FLAGDROP);
if(f.actor==player1) conoutf("\f2you lost the flag");
else conoutf("\f2%s lost %s flag", f.actor->name, (own ? "your" : "the enemy"));
else conoutf("\f2%s lost %s flag", colorname(f.actor), (own ? "your" : "the enemy"));
break;
}
case SV_FLAGRETURN:
{
playsound(S_FLAGRETURN);
if(f.actor==player1) conoutf("\f2you returned your flag");
else conoutf("\f2%s returned %s flag", f.actor->name, (own ? "your" : "the enemy"));
else conoutf("\f2%s returned %s flag", colorname(f.actor), (own ? "your" : "the enemy"));
break;
}
case SV_FLAGSCORE:
@@ -603,7 +603,7 @@ void flagmsg(int flag, int action)
conoutf("\f2you scored");
addmsg(SV_FLAGS, "ri", ++player1->flagscore);
}
else conoutf("\f2%s scored for %s team", f.actor->name, (own ? "the enemy" : "your"));
else conoutf("\f2%s scored for %s team", colorname(f.actor), (own ? "the enemy" : "your"));
break;
}
case SV_FLAGRESET:
@@ -666,7 +666,7 @@ void refreshsopmenu(void *menu, bool init)
{
string &s = mlines.add().cmd;
s_sprintf(s)("%s %d", menu==kickmenu ? "kick" : (menu==banmenu ? "ban" : (menu==forceteammenu ? "forceteam" : "givemaster")), i);
menumanual(menu, item++, players[i]->name, s);
menumanual(menu, item++, colorname(players[i]), s);
}
}