mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-11-05 13:46:17 +00:00
Merge pull request #217 from jruderman/statue_dice
Fix crash by disallowing statue-dice swaps
This commit is contained in:
commit
0f0897ecf4
@ -409,7 +409,7 @@ bool sharkpassable(cell *w, cell *c) {
|
|||||||
EX bool canPushStatueOn(cell *c, flagtype flags) {
|
EX bool canPushStatueOn(cell *c, flagtype flags) {
|
||||||
return passable(c, NULL, P_MONSTER | flags) && !snakelevel(c) &&
|
return passable(c, NULL, P_MONSTER | flags) && !snakelevel(c) &&
|
||||||
!isWorm(c->monst) && !isReptile(c->wall) && !peace::on &&
|
!isWorm(c->monst) && !isReptile(c->wall) && !peace::on &&
|
||||||
!cellHalfvine(c) &&
|
!cellHalfvine(c) && !isDie(c->wall) &&
|
||||||
!among(c->wall, waBoat, waFireTrap, waArrowTrap);
|
!among(c->wall, waBoat, waFireTrap, waArrowTrap);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user