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@927 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
Lee Salzman
2007-04-05 22:46:33 +00:00
parent 220bcccd58
commit 9eca56fb0e
5 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+2 -2
View File
@@ -422,7 +422,7 @@ void showteamkill() { player1->lastteamkill = lastmillis; }
// damage arriving from the network, monsters, yourself, all ends up here.
void selfdamage(int damage, int actor, playerent *act, bool gib, playerent *pl)
void dodamage(int damage, int actor, playerent *act, bool gib, playerent *pl)
{
if(!act) return;
if(pl->state!=CS_ALIVE || editmode || intermission) return;
@@ -596,7 +596,7 @@ COMMANDN(map, changemap, ARG_1STR);
void suicide()
{
if(player1->state==CS_DEAD) return;
selfdamage(1000, -1, player1);
dodamage(1000, -1, player1);
demodamage(1000, player1->o);
}