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@426 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2006-10-08 11:57:33 +00:00
parent 7ff2d20385
commit eb23c4546e
19 changed files with 572 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/weapon.cpp
+2 -3
View File
@@ -16,7 +16,7 @@ guninfo guns[NUMGUNS] =
{ S_SHOTGUN, S_RSHOTGUN, 2400, 1000, 6, 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, 17, 0, 0, 70, 15, 30, 1, 2, true, "subgun" },
{ S_SNIPER, S_RSNIPER, 1950, 1500, 72, 0, 0, 60, 50, 5, 4, 4, false, "sniper" },
{ S_ASSULT, S_RASSULT, 2000, 130, 20, 0, 0, 20, 40, 20, 0, 2, true, "assult" }, //recoil was 44
{ S_ASSAULT, S_RASSAULT, 2000, 130, 20, 0, 0, 20, 40, 20, 0, 2, true, "assault" }, //recoil was 44
{ S_NULL, S_NULL, 1000, 1200, 150, 20, 6, 1, 1, 1, 3, 1, "grenade" },
};
@@ -92,7 +92,7 @@ COMMAND(altattack, ARG_NONE);
void reload(dynent *d)
{
if(!d || d->reloading) return;
if(d == player1 && scoped) { togglescope(); };
if(d == player1 && scoped) { togglescope(); };
bool akimbo = d->gunselect==GUN_PISTOL && d->akimbo!=0;
if(d->gunselect==GUN_KNIFE || d->gunselect==GUN_GRENADE) return;
@@ -466,7 +466,6 @@ physent *new_nade(dynent *d, int millis = 0)
void explode_nade(physent *i)
{
if(!i) return;
printf("explode\n");
if(i->state != NADE_THROWED)
{