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

no message

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@829 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-01-16 19:35:34 +00:00
parent 929ca2d256
commit 901adb217b
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+5 -4
View File
@@ -448,6 +448,7 @@ void selfdamage(int damage, int actor, playerent *act, bool gib, playerent *pl)
pl->roll += pl->roll>0 ? droll : (pl->roll<0 ? -droll : (rnd(2) ? droll : -droll)); // give player a kick depending on amount of damage
if((pl->health -= damage)<=0)
{
s_sprintfd(death)("%s", gib ? "GIBBED" : "fragged");
if(pl->type==ENT_BOT)
{
if(pl==act)
@@ -458,13 +459,13 @@ void selfdamage(int damage, int actor, playerent *act, bool gib, playerent *pl)
else if(isteam(pl->team, act->team))
{
--act->frags;
conoutf("\f2%s fragged %s teammate (%s)", act==player1 ? "you" : act->name, act==player1 ? "a" : "his", pl->name);
conoutf("\f2%s %s %s teammate (%s)", act==player1 ? "you" : act->name, death, act==player1 ? "a" : "his", pl->name);
if(act==player1) showteamkill();
}
else
{
act->frags += gib ? 2 : 1;
conoutf("\f2%s fragged %s", act==player1 ? "you" : act->name, pl->name);
conoutf("\f2%s %s %s", act==player1 ? "you" : act->name, death, pl->name);
};
}
else if(act==pl)
@@ -475,8 +476,8 @@ void selfdamage(int damage, int actor, playerent *act, bool gib, playerent *pl)
}
else if(act)
{
if(isteam(act->team, player1->team)) conoutf("\f2you got fragged by a teammate (%s)", act->name);
else conoutf("\f2you got fragged by %s", act->name);
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(pl==player1)
{
source/src/clients2c.cpp
+5 -4
View File
@@ -250,6 +250,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
{
if(!d) return;
int actor = getint(p);
s_sprintfd(death)("%s", gib ? "GIBBED" : "fragged");
if(actor==cn)
{
@@ -261,14 +262,14 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
if(isteam(player1->team, d->team))
{
frags = -1;
conoutf("\f2you fragged a teammate (%s)", d->name);
conoutf("\f2you %s a teammate (%s)", death, d->name);
extern void showteamkill();
showteamkill();
}
else
{
frags = gib ? 2 : 1;
conoutf("\f2you fragged %s", d->name);
conoutf("\f2you %s %s", death, d->name);
};
addmsg(SV_FRAGS, "ri", player1->frags += frags);
if(gib) addgib(d);
@@ -280,11 +281,11 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
{
if(isteam(a->team, d->team))
{
conoutf("\f2%s fragged his teammate (%s)", a->name, d->name);
conoutf("\f2%s %s his teammate (%s)", a->name, death, d->name);
}
else
{
conoutf("\f2%s fragged %s", a->name, d->name);
conoutf("\f2%s %s %s", a->name, death, d->name);
};
if(gib) addgib(d);
};