mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2025-10-15 22:27:38 +00:00
Code Issues Releases Wiki Activity

fixed switching messages

Browse Source
This commit is contained in:
Zeno Rogue
2021-08-04 20:15:46 +02:00
parent d98c8a025f
commit 9ce7a243ed
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pcmove.cpp
View File

@@ -893,8 +893,7 @@ bool pcmove::after_escape() {
#endif
return false;
}
else if(c2->monst && (!isFriendly(c2) || c2->monst == moTameBomberbird || isMountable(c2->monst))
&& !(peace::on && !isMultitile(c2->monst) && !good_tortoise))
else if(c2->monst && (!isFriendly(c2) || c2->monst == moTameBomberbird || isMountable(c2->monst)) && !(peace::on && !good_tortoise))
return attack();
else if(!passable(c2, cwt.at, P_USEBOAT | P_ISPLAYER | P_MIRROR | P_MONSTER)) {
tell_why_impassable();
@@ -925,7 +924,7 @@ bool pcmove::move_if_okay() {
return false;
}
if(switchplace_prevent(cwt.at, c2, checkonly))
if(switchplace_prevent(cwt.at, c2, *this))
return false;
if(!checkonly && warningprotection_hit(do_we_stab_a_friend(mi, moPlayer)))
return false;