no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@840 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-01-16 21:39:49 +00:00
parent 77b30d8676
commit d9d6d33417
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -456,7 +456,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");
s_sprintfd(death)("%s", gib ? "gibbed" : "fragged");
if(pl->type==ENT_BOT)
{
if(pl==act)
+1 -1
View File
@@ -256,7 +256,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p)
if(!d) return;
int actor = getint(p);
playerent *act = NULL;
s_sprintfd(death)("%s", gib ? "GIBBED" : "fragged");
s_sprintfd(death)("%s", gib ? "gibbed" : "fragged");
if(actor==cn)
{
+1 -1
View File
@@ -88,7 +88,7 @@ itemstat itemstats[] =
{14, 28, 21, S_ITEMAMMO}, //shotgun
{60, 90, 90, S_ITEMAMMO}, //subgun
{10, 20, 15, S_ITEMAMMO}, //sniper
{24, 60, 60, S_ITEMAMMO}, //assault
{30, 60, 60, S_ITEMAMMO}, //assault
{2, 0, 2, S_ITEMAMMO}, //grenade
{33, 100, 100, S_ITEMHEALTH}, //health
{50, 100, 100, S_ITEMARMOUR}, //armour
+1 -1
View File
@@ -16,7 +16,7 @@ guninfo guns[NUMGUNS] =
{ S_SHOTGUN, S_RSHOTGUN, 2400, 1000, 5, 0, 0, 1, 35, 7, 9, 9, false, "shotgun" }, //reload time is for 1 shell from 7 too powerful to 6
{ S_SUBGUN, S_RSUBGUN, 1650, 80, 16, 0, 0, 70, 15, 30, 1, 2, true, "subgun" },
{ S_SNIPER, S_RSNIPER, 1950, 1500, 85, 0, 0, 60, 50, 5, 4, 4, false, "sniper" },
{ S_ASSAULT, S_RASSAULT, 2000, 130, 24, 0, 0, 20, 40, 12, 0, 2, true, "assault" }, //recoil was 44
{ S_ASSAULT, S_RASSAULT, 2000, 130, 24, 0, 0, 20, 40, 15, 0, 2, true, "assault" }, //recoil was 44
{ S_NULL, S_NULL, 1000, 1200, 150, 20, 6, 1, 1, 1, 3, 1, false, "grenade" },
};