vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

This should work a bit better.

Browse source
This commit is contained in:
Marco Cawthorne 2017-09-26 00:35:03 -05:00
parent 54ab0cf6ed
commit 3c591536dc
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Source/Server/Damage.c
View file

@ -117,7 +117,7 @@ void Damage_Apply( entity eTarget, entity eAttacker, int iDamage, vector vHitPos
if ( eTarget.armor ) { if ( eTarget.armor ) {
float fRatio = 0.5; float fRatio = 0.5;
if ( eAttacker != world ) { if ( eAttacker.weapon ) {
fRatio = wptTable[ eAttacker.weapon ].fWeaponArmorRatio; fRatio = wptTable[ eAttacker.weapon ].fWeaponArmorRatio;
} }
@ -132,11 +132,10 @@ void Damage_Apply( entity eTarget, entity eAttacker, int iDamage, vector vHitPos
eTarget.armor = 0; eTarget.armor = 0;
eTarget.iEquipment -= EQUIPMENT_KEVLAR; eTarget.iEquipment -= EQUIPMENT_KEVLAR;
} else { } else {
int oldValue = eTarget.armor;
if ( fNewArmor < 0 ) { if ( fNewArmor < 0 ) {
fNewArmor = 1; fNewArmor = 1;
} }
eTarget.armor = ( oldValue - fNewArmor ); eTarget.armor -= fNewArmor;
} }
eTarget.health -= fNewDmg; eTarget.health -= fNewDmg;
} else { } else {

BIN
freecs/progs.dat
View file

Binary file not shown.