Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Allanis 2014-04-15 22:06:44 +01:00
commit d99e073a9c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/weapon.c
View File

@ -173,8 +173,8 @@ static void think_seeker(Weapon* w, const double dt) {
return; return;
} }
/* Ammo isn't locked on yet.. */ /* Only run if locked on. */
if(SDL_GetTicks() > (w->outfit->u.amm.lockon)) { if(w->lockon < 0.) {
switch(w->status) { switch(w->status) {
case WEAPON_STATUS_OK: /* Check to see if can get jammed. */ case WEAPON_STATUS_OK: /* Check to see if can get jammed. */
if((p->jam_range != 0.) && /* Target has jammer and weapon is in range. */ if((p->jam_range != 0.) && /* Target has jammer and weapon is in range. */