From f9f70d12306cae4f22daf36a43f4eb0faace68be Mon Sep 17 00:00:00 2001 From: driAn Date: Thu, 15 May 2008 20:47:16 +0000 Subject: [PATCH] more grenade dmg, flag drop on suicide git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@1984 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/clientgame.cpp | 8 ++++---- source/src/entity.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp index 8ef5c3ba..8683a532 100644 --- a/source/src/clientgame.cpp +++ b/source/src/clientgame.cpp @@ -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; } diff --git a/source/src/entity.h b/source/src/entity.h index 63213406..659d0a36 100644 --- a/source/src/entity.h +++ b/source/src/entity.h @@ -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 }, };