From d9d6d33417487d05642dcab0940f593f6bf093dc Mon Sep 17 00:00:00 2001
From: driAn <adrian26ch@yahoo.de>
Date: Tue, 16 Jan 2007 21:39:49 +0000
Subject: [PATCH] no message

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@840 e016b1c5-ed68-44aa-a2f7-31cac88cffde
---
 source/src/clientgame.cpp | 2 +-
 source/src/clients2c.cpp  | 2 +-
 source/src/entities.cpp   | 2 +-
 source/src/weapon.cpp     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/src/clientgame.cpp b/source/src/clientgame.cpp
index 94a05abb..40cd5b34 100644
--- a/source/src/clientgame.cpp
+++ b/source/src/clientgame.cpp
@@ -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) 
diff --git a/source/src/clients2c.cpp b/source/src/clients2c.cpp
index 2b06a9cf..da57915f 100644
--- a/source/src/clients2c.cpp
+++ b/source/src/clients2c.cpp
@@ -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)
             {
diff --git a/source/src/entities.cpp b/source/src/entities.cpp
index 0bcae1b9..6f839ba7 100644
--- a/source/src/entities.cpp
+++ b/source/src/entities.cpp
@@ -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
diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp
index 7c1476fb..cfae90a0 100644
--- a/source/src/weapon.cpp
+++ b/source/src/weapon.cpp
@@ -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" },
 };