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@711 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2006-11-19 04:21:26 +00:00
parent f53a4c6983
commit 536995cdc5
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+1 -6
View File
@@ -421,7 +421,6 @@ void mousemove(int dx, int dy)
void selfdamage(int damage, int actor, playerent *act, bool gib, playerent *pl)
{
if(!act) return;
if(pl->state!=CS_ALIVE || editmode || intermission) return;
if(pl==player1)
@@ -455,11 +454,7 @@ void selfdamage(int damage, int actor, playerent *act, bool gib, playerent *pl)
conoutf("%s fragged %s", act==player1 ? "you" : act->name, pl->name);
};
}
else if(actor==-2)
{
conoutf("you got killed by %s!", &act->name);
}
else if(actor==-1)
else if(act==pl)
{
actor = getclientnum();
conoutf("you suicided!");
source/src/weapon.cpp
+1 -1
View File
@@ -254,7 +254,7 @@ void newprojectile(vec &from, vec &to, float speed, bool local, playerent *owner
void hit(int target, int damage, playerent *d, playerent *at, bool gib=false)
{
d->lastpain = lastmillis;
if(d==player1 || d->type==ENT_BOT) selfdamage(damage, at==d ? -1 : -2, at, gib, d);
if(d==player1 || d->type==ENT_BOT) selfdamage(damage, -1, at, gib, d);
else
{
addmsg(gib ? SV_GIBDAMAGE : SV_DAMAGE, "ri3", target, damage, d->lifesequence);