eukara
/
fallout2-ce
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix weapon safety check

This commit is contained in:
Alexander Batalov 2022-08-31 19:56:09 +03:00
parent 857d3902bb
commit 676098dc5f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/combat_ai.cc
View File

@ -2526,7 +2526,9 @@ static int _ai_try_attack(Object* a1, Object* a2)
|| (critterGetBodyType(a2) == BODY_TYPE_BIPED || (critterGetBodyType(a2) == BODY_TYPE_BIPED
&& ((a2->fid & 0xF000) >> 12 == 0) && ((a2->fid & 0xF000) >> 12 == 0)
&& artExists(buildFid(OBJ_TYPE_CRITTER, a1->fid & 0xFFF, ANIM_THROW_PUNCH, 0, a1->rotation + 1)))) { && artExists(buildFid(OBJ_TYPE_CRITTER, a1->fid & 0xFFF, ANIM_THROW_PUNCH, 0, a1->rotation + 1)))) {
if (_combat_safety_invalidate_weapon(a1, weapon, HIT_MODE_RIGHT_WEAPON_PRIMARY, a2, &v31)) { // SFALL: Check the safety of weapons based on the selected attack mode
// instead of always the primary weapon hit mode.
if (_combat_safety_invalidate_weapon(a1, weapon, hitMode, a2, &v31)) {
_ai_switch_weapons(a1, &hitMode, &weapon, a2); _ai_switch_weapons(a1, &hitMode, &weapon, a2);
} }
} else { } else {