Merge branch 'dev'

src/weapon.c

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