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

Fix to prevent corpses from blocking line of fire

This commit is contained in:
Alexander Batalov 2022-05-20 11:10:56 +03:00
parent d336a84e20
commit 4e7489e105
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/object.c
View File

@ -2450,7 +2450,10 @@ Object* _obj_shoot_blocking_at(Object* obj, int tile, int elev)
unsigned int flags = candidate->flags; unsigned int flags = candidate->flags;
if ((flags & OBJECT_HIDDEN) == 0 && ((flags & OBJECT_NO_BLOCK) == 0 || (flags & OBJECT_FLAG_0x80000000) == 0) && candidate != obj) { if ((flags & OBJECT_HIDDEN) == 0 && ((flags & OBJECT_NO_BLOCK) == 0 || (flags & OBJECT_FLAG_0x80000000) == 0) && candidate != obj) {
int type = (candidate->fid & 0xF000000) >> 24; int type = (candidate->fid & 0xF000000) >> 24;
if (type == OBJ_TYPE_CRITTER || type == OBJ_TYPE_SCENERY || type == OBJ_TYPE_WALL) { // SFALL: Fix to prevent corpses from blocking line of fire.
if ((type == OBJ_TYPE_CRITTER && !critterIsDead(candidate))
|| type == OBJ_TYPE_SCENERY
|| type == OBJ_TYPE_WALL) {
return candidate; return candidate;
} }
} }
@ -2472,7 +2475,11 @@ Object* _obj_shoot_blocking_at(Object* obj, int tile, int elev)
if (candidate->elevation == elev) { if (candidate->elevation == elev) {
if ((flags & OBJECT_HIDDEN) == 0 && (flags & OBJECT_NO_BLOCK) == 0 && candidate != obj) { if ((flags & OBJECT_HIDDEN) == 0 && (flags & OBJECT_NO_BLOCK) == 0 && candidate != obj) {
int type = (candidate->fid & 0xF000000) >> 24; int type = (candidate->fid & 0xF000000) >> 24;
if (type == OBJ_TYPE_CRITTER || type == OBJ_TYPE_SCENERY || type == OBJ_TYPE_WALL) { // SFALL: Fix to prevent corpses from blocking line of
// fire.
if ((type == OBJ_TYPE_CRITTER && !critterIsDead(candidate))
|| type == OBJ_TYPE_SCENERY
|| type == OBJ_TYPE_WALL) {
return candidate; return candidate;
} }
} }