From 16ba5bdb67150ed36eb057a9414062bd78e2af65 Mon Sep 17 00:00:00 2001 From: driAn Date: Tue, 16 Jan 2007 17:34:29 +0000 Subject: [PATCH] no message git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@825 e016b1c5-ed68-44aa-a2f7-31cac88cffde --- source/src/entities.cpp | 2 +- source/src/weapon.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/source/src/entities.cpp b/source/src/entities.cpp index c9083420..0bcae1b9 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 - {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 diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp index b77320c9..aa0e707d 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, 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)