Permalink
Browse files

Merge pull request #639 from onpon4/alwaysfull

Reverted 63960aa and 60540c2.
  • Loading branch information...
2 parents b806ead + 8d97039 commit e4bce01116fab14470de1e3921cbfc58cc78221f @BTAxis BTAxis committed Jun 6, 2016
Showing with 1 addition and 7 deletions.
  1. +1 −7 src/pilot_weapon.c
View
8 src/pilot_weapon.c
@@ -1386,8 +1386,6 @@ void pilot_weaponSane( Pilot *p )
*/
int pilot_outfitOff( Pilot *p, PilotOutfitSlot *o )
{
- double c;
-
/* Must not be disabled or cooling down. */
if ((pilot_isDisabled(p)) || (pilot_isFlag(p, PILOT_COOLDOWN)))
return 0;
@@ -1399,11 +1397,7 @@ int pilot_outfitOff( Pilot *p, PilotOutfitSlot *o )
o->stimer = -1;
}
else {
- c = outfit_cooldown( o->outfit );
- if (o->stimer != INFINITY)
- o->stimer = c - (c * o->stimer / outfit_duration( o->outfit ));
- else
- o->stimer = c;
+ o->stimer = outfit_cooldown( o->outfit );
o->state = PILOT_OUTFIT_COOLDOWN;
}

0 comments on commit e4bce01

Please sign in to comment.