From 5acdab45d62d6dd44ecd494020bf05ac9a257b11 Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Sat, 26 Dec 2020 17:17:05 +0100 Subject: [PATCH] fixed a crash bug when collecting an Orb of Safety via Orb of Space with Orb of Impact active --- orbs.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/orbs.cpp b/orbs.cpp index f81d9a33..2f0f84d3 100644 --- a/orbs.cpp +++ b/orbs.cpp @@ -1215,7 +1215,11 @@ EX eItem targetRangedOrb(cell *c, orbAction a) { // (0) telekinesis if(c->item && !itemHiddenFromSight(c) && !cwt.at->item && items[itOrbSpace] >= fixpower(spacedrain(c).first) && !cantGetGrimoire(c, !isCheck(a)) && c->item != itBarrow) { - if(!isCheck(a)) telekinesis(c), apply_impact(c); + if(!isCheck(a)) { + bool saf = c->item == itOrbSafety; + telekinesis(c); + if(!saf) apply_impact(c); + } return itOrbSpace; }