mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2025-02-08 23:20:12 +00:00
fixed a crash bug when collecting an Orb of Safety via Orb of Space with Orb of Impact active
This commit is contained in:
parent
1f5951dbee
commit
5acdab45d6
6
orbs.cpp
6
orbs.cpp
@ -1215,7 +1215,11 @@ EX eItem targetRangedOrb(cell *c, orbAction a) {
|
|||||||
// (0) telekinesis
|
// (0) telekinesis
|
||||||
if(c->item && !itemHiddenFromSight(c) && !cwt.at->item && items[itOrbSpace] >= fixpower(spacedrain(c).first) && !cantGetGrimoire(c, !isCheck(a))
|
if(c->item && !itemHiddenFromSight(c) && !cwt.at->item && items[itOrbSpace] >= fixpower(spacedrain(c).first) && !cantGetGrimoire(c, !isCheck(a))
|
||||||
&& c->item != itBarrow) {
|
&& 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;
|
return itOrbSpace;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user