From 8943c9322bc10193ba94bec78f6172b0929a1010 Mon Sep 17 00:00:00 2001
From: Allanis <allanis@saracraft.net>
Date: Tue, 5 Feb 2013 23:44:08 +0000
Subject: [PATCH] [Fix] Shield/Armor bars work correctly now.
---
src/pilot.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/pilot.c b/src/pilot.c
index 66a78e2..b6ac685 100644
--- a/src/pilot.c
+++ b/src/pilot.c
@@ -69,11 +69,12 @@ void pilot_shoot(Pilot* p, int secondary) {
// Damage the pilot.
void pilot_hit(Pilot* p, double damage_shield, double damage_armor) {
- if(p->shield -= damage_shield > 0.)
+ if(p->shield - damage_shield > 0.)
p->shield -= damage_shield;
else if(p->shield > 0.) {
// Shields can take part of the blow.
p->armor -= p->shield/damage_shield*damage_armor;
+ p->shield = 0.;
}
else if(p->armor-damage_armor > 0.)
p->armor -= damage_armor;