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

no message

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@825 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2007-01-16 17:34:29 +00:00
parent d993d54f8e
commit 16ba5bdb67
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/entities.cpp
+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
{40, 60, 60, S_ITEMAMMO}, //assault
{24, 60, 60, S_ITEMAMMO}, //assault
{2, 0, 2, S_ITEMAMMO}, //grenade
{33, 100, 100, S_ITEMHEALTH}, //health
{50, 100, 100, S_ITEMARMOUR}, //armour
source/src/weapon.cpp
+1 -2
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, 25, 0, 0, 20, 40, 15, 0, 2, false, "assault" }, //recoil was 44
{ S_ASSAULT, S_RASSAULT, 2000, 130, 25, 0, 0, 20, 40, 12, 0, 2, true, "assault" }, //recoil was 44
{ S_NULL, S_NULL, 1000, 1200, 150, 20, 6, 1, 1, 1, 3, 1, false, "grenade" },
};
@@ -621,7 +621,6 @@ void shoot(playerent *d, vec &targ)
if(d->gunselect!=GUN_KNIFE && !hasammo(d)) { d->shots = 0; return; };
if(guns[d->gunselect].isauto) d->shots++;
else if(d->gunselect == GUN_ASSAULT) { if(++d->shots >= 2) d->attacking = false; }
else d->attacking = false;
if(d->gunselect==GUN_PISTOL && d->akimbo)