mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-02-08 23:20:12 +00:00
Code Issues Releases Wiki Activity

fixed monster cloned after pushing

Browse Source
This commit is contained in:
Zeno Rogue 2020-03-02 02:37:07 +01:00
parent 4af00c37e8
commit 4415db42c2
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcmove.cpp
View File

@ -568,6 +568,7 @@ bool pcmove::actual_move() {
if(isPushable(c2->wall) && !c2->monst && !nonAdjacentPlayer(c2, cwt.at) && fmsMove) { if(isPushable(c2->wall) && !c2->monst && !nonAdjacentPlayer(c2, cwt.at) && fmsMove) {
mip = determinePush(cwt, subdir, [c2] (cell *c) { return canPushThumperOn(c, c2, cwt.at); }); mip = determinePush(cwt, subdir, [c2] (cell *c) { return canPushThumperOn(c, c2, cwt.at); });
if(mip.t) changes.ccell(mip.t);
if(mip.d == NO_SPACE) { if(mip.d == NO_SPACE) {
addMessage(XLAT("No room to push %the1.", c2->wall)); addMessage(XLAT("No room to push %the1.", c2->wall));
return false; return false;
@ -862,6 +863,7 @@ bool pcmove::attack() {
mip = determinePush(cwt, subdir, [c2] (cell *c) { return passable(c, c2, P_BLOW); }); mip = determinePush(cwt, subdir, [c2] (cell *c) { return passable(c, c2, P_BLOW); });
else else
mip.t = c2; mip.t = c2;
if(mip.t) changes.ccell(mip.t);
} }
if(havePushConflict(mip.t, checkonly)) return false; if(havePushConflict(mip.t, checkonly)) return false;