1
This commit is contained in:
parent
b526e5dd3d
commit
d4029bffb8
@ -265,7 +265,7 @@ void Human::DecHP(float dec_hp, int killer_id, const std::string killer_name, in
|
|||||||
kPropArmorShield,
|
kPropArmorShield,
|
||||||
armor_shield,
|
armor_shield,
|
||||||
max_armor_shield,
|
max_armor_shield,
|
||||||
true);
|
false);
|
||||||
GetTrigger()->ReceiveDmg();
|
GetTrigger()->ReceiveDmg();
|
||||||
} else if (energy_shield > 0.001f) {
|
} else if (energy_shield > 0.001f) {
|
||||||
energy_shield = std::max(0.0f, energy_shield - dec_hp);
|
energy_shield = std::max(0.0f, energy_shield - dec_hp);
|
||||||
@ -275,7 +275,7 @@ void Human::DecHP(float dec_hp, int killer_id, const std::string killer_name, in
|
|||||||
kPropEnergyShield,
|
kPropEnergyShield,
|
||||||
energy_shield,
|
energy_shield,
|
||||||
max_energy_shield,
|
max_energy_shield,
|
||||||
true);
|
false);
|
||||||
GetTrigger()->ReceiveDmg();
|
GetTrigger()->ReceiveDmg();
|
||||||
if (energy_shield <= 0) {
|
if (energy_shield <= 0) {
|
||||||
GetTrigger()->DestoryEnergyShield();
|
GetTrigger()->DestoryEnergyShield();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user