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@1138 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2007-06-04 21:43:00 +00:00
parent a2476bf408
commit c82fd507c1
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+6 -6
View File
@@ -52,7 +52,7 @@ 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[4];
s_sprintf(cname[num])("%s%s \fs\f5(%d)\fr", prefix, name, d->clientnum);
s_sprintf(cname[num])("%s%s \fs\f6(%d)\fr", prefix, name, d->clientnum);
return cname[num];
}
@@ -406,18 +406,18 @@ void dodamage(int damage, int actor, playerent *act, bool gib, playerent *pl)
if(pl==act)
{
--pl->frags;
conoutf("\f2%s suicided", pl->name);
conoutf("\f2%s suicided", colorname(pl));
}
else if(isteam(pl->team, act->team))
{
--act->frags;
conoutf("\f2%s %s %s teammate (%s)", act==player1 ? "you" : act->name, death, act==player1 ? "a" : "his", pl->name);
conoutf("\f2%s %s %s teammate (%s)", act==player1 ? "you" : colorname(act, 0), death, act==player1 ? "a" : "his", colorname(pl, 1));
if(act==player1) showteamkill();
}
else
{
act->frags += gib ? 2 : 1;
conoutf("\f2%s %s %s", act==player1 ? "you" : act->name, death, pl->name);
conoutf("\f2%s %s %s", act==player1 ? "you" : colorname(act, 0), death, colorname(pl, 1));
}
}
else if(act==pl)
@@ -428,8 +428,8 @@ void dodamage(int damage, int actor, playerent *act, bool gib, playerent *pl)
}
else if(act)
{
if(isteam(act->team, player1->team)) conoutf("\f2you got %s by a teammate (%s)", death, act->name);
else conoutf("\f2you got %s by %s", death, act->name);
if(isteam(act->team, player1->team)) conoutf("\f2you got %s by a teammate (%s)", death, colorname(act));
else conoutf("\f2you got %s by %s", death, colorname(act));
}
if(pl==player1)
{
source/src/rendertext.cpp
+1
View File
@@ -193,6 +193,7 @@ void draw_text(const char *str, int left, int top)
case '3': glColor3ub(255, 64, 64); i++; continue; // red: important errors
case '4': glColor3ub(128, 128, 128); i++; continue; // gray
case '5': glColor3ub(255, 255, 255); i++; continue; // white: everything else
case '6': glColor3ub(192, 64, 192); i++; continue; // magenta
case 's': // save color
if((size_t)colorpos<sizeof(colorstack)/sizeof(colorstack[0]))
{