From 4a8053d57a066c25533f405f65e77fc1474d767b Mon Sep 17 00:00:00 2001 From: WALL OF JUSTICE <-> Date: Sun, 18 Mar 2018 14:18:59 +1100 Subject: [PATCH] * Fix crash when friendly fire enabled in sanctum map, was using wrong entity vairable. --- src/entity.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/entity.cpp b/src/entity.cpp index affbdc018..c10f9f2b8 100644 --- a/src/entity.cpp +++ b/src/entity.cpp @@ -4371,12 +4371,12 @@ void Entity::attack(int pose, int charge, Entity* target) { return; } - if ( (myStats->type == LICH_FIRE && entity->getRace() == LICH_ICE) - || (myStats->type == LICH_ICE && entity->getRace() == LICH_FIRE) ) - { - // friendship <3 - return; - } + } + else if ( (myStats->type == LICH_FIRE && hit.entity->getRace() == LICH_ICE) + || (myStats->type == LICH_ICE && hit.entity->getRace() == LICH_FIRE) ) + { + // friendship <3 + return; } if ( hit.entity->behavior == &actBoulder )