rob/nexus
rob
/
nexus
1
0
Fork 0
Code Issues 24 Pull Requests Projects Releases Wiki Activity

Fix bug in fire damage calculation

This commit is contained in:
Rob Pearce 2021-11-16 11:23:16 +11:00
parent 94b5e84ee1
commit d4861e906f
1 changed files with 501 additions and 502 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
objects.c Normal file → Executable file
View File

@ -14963,8 +14963,7 @@ int real_takedamage(object_t *o, int howmuch, int damtype, int wantannounce, lif
f = hasflag(o->flags, F_EQUIPPED); f = hasflag(o->flags, F_EQUIPPED);
if (f) { if (f) {
// no damage from equipped _weapons_ // no damage from equipped _weapons_
if ((f->val[0] != BP_WEAPON) || (f->val[0] != BP_SECWEAPON)) { if ((f->val[0] != BP_WEAPON) && (f->val[0] != BP_SECWEAPON)) {
} else {
// equipped clothes/armour? full damage. // equipped clothes/armour? full damage.
lfdam = howmuch; lfdam = howmuch;
} }