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

more grenade dmg, flag drop on suicide

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1984 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-05-15 20:47:16 +00:00
parent 7f3e0ca23e
commit f9f70d1230
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/clientgame.cpp
+4 -4
View File
@@ -445,15 +445,14 @@ void dokill(playerent *pl, playerent *act, bool gib)
else outf("\f2%s %s %s", aname, death, pname);
}
if(pl==player1)
{
if(m_ctf) tryflagdrop(pl!=act && isteam(act->team, pl->team));
}
if(m_ctf && pl==player1) tryflagdrop(pl!=act && isteam(act->team, pl->team));
if(gib)
{
if(pl!=act && act->weaponsel->type == GUN_SNIPER) playsound(S_HEADSHOT, SP_LOW);
addgib(pl);
}
if(!m_mp(gamemode))
{
if(pl==act || isteam(pl->team, act->team)) act->frags--;
@@ -584,6 +583,7 @@ void suicide()
if(!m_mp(gamemode)) dokill(player1, player1);
else if(suicided!=player1->lifesequence)
{
tryflagdrop(false);
addmsg(SV_SUICIDE, "r");
suicided = player1->lifesequence;
}
source/src/entity.h
+1 -1
View File
@@ -69,7 +69,7 @@ static guninfo guns[NUMGUNS] =
{ "subgun", S_SUBGUN, S_RSUBGUN, 1650, 80, 16, 0, 0, 70, 15, 30, 1, 2, 3, 20, 60, 200, 1, true },
{ "sniper", S_SNIPER, S_RSNIPER, 1950, 1500, 85, 0, 0, 60, 50, 5, 4, 4, 1, 100, 500, 100, 1, false },
{ "assault", S_ASSAULT, S_RASSAULT, 2000, 130, 24, 0, 0, 20, 40, 15, 0, 2, 2, 25, 60, 150, 1, true },
{ "grenade", S_NULL, S_NULL, 1000, 650, 150, 20, 6, 1, 1, 1, 3, 1, 0, 0, 0, 0, 3, false },
{ "grenade", S_NULL, S_NULL, 1000, 650, 200, 20, 6, 1, 1, 1, 3, 1, 0, 0, 0, 0, 3, false },
{ "pistol", S_PISTOL, S_RAKIMBO, 1400, 85, 19, 0, 0, 80, 10, 16, 6, 5, 1, 40, 75, 150, 1, true },
};