Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed bug #10443. 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3319 4a71c877-e1ca-e34f-864e-861f7616d084
master
Roman C 2008-01-02 21:32:14 +00:00
parent 2c7b375170
commit ee9dd1108a
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/combat.c
View File

@ -276,19 +276,6 @@ void combFire(WEAPON *psWeap, BASE_OBJECT *psAttacker, BASE_OBJECT *psTarget, in
return; return;
} }
// if target was in range deal with weapon fire
if(baseHitChance > 0)
{
/* note when the weapon fired */
psWeap->lastFired = gameTime;
/* reduce ammo if salvo */
if (psStats->reloadTime)
{
psWeap->ammo--;
}
}
// apply experience accuracy modifiers to the base // apply experience accuracy modifiers to the base
//hit chance, not to the final hit chance //hit chance, not to the final hit chance
resultHitChance = baseHitChance; resultHitChance = baseHitChance;
@ -331,6 +318,19 @@ void combFire(WEAPON *psWeap, BASE_OBJECT *psAttacker, BASE_OBJECT *psTarget, in
} }
} }
// if target was in range deal with weapon fire
if(baseHitChance > 0)
{
/* note when the weapon fired */
psWeap->lastFired = gameTime;
/* reduce ammo if salvo */
if (psStats->reloadTime)
{
psWeap->ammo--;
}
}
// visibility modifiers // visibility modifiers
//if (psTarget->visible[psAttacker->player] < VIS_ATTACK_MOD_LEVEL) //if (psTarget->visible[psAttacker->player] < VIS_ATTACK_MOD_LEVEL)
if (psTarget->visible[psAttacker->player] == 0) //not sure if this can ever be > 0 here if (psTarget->visible[psAttacker->player] == 0) //not sure if this can ever be > 0 here