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

[Fix] Shield/Armor bars work correctly now.

Browse Source
This commit is contained in:
Allanis 2013-02-05 23:44:08 +00:00
parent 1024eb02e2
commit 8943c9322b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/pilot.c
View File

@ -69,11 +69,12 @@ void pilot_shoot(Pilot* p, int secondary) {
// Damage the pilot. // Damage the pilot.
void pilot_hit(Pilot* p, double damage_shield, double damage_armor) { 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; p->shield -= damage_shield;
else if(p->shield > 0.) { else if(p->shield > 0.) {
// Shields can take part of the blow. // Shields can take part of the blow.
p->armor -= p->shield/damage_shield*damage_armor; p->armor -= p->shield/damage_shield*damage_armor;
p->shield = 0.;
} }
else if(p->armor-damage_armor > 0.) else if(p->armor-damage_armor > 0.)
p->armor -= damage_armor; p->armor -= damage_armor;