mirrors/hyperrogue
1
0
Fork 0
mirror of https://github.com/zenorogue/hyperrogue.git synced 2024-12-26 10:00:42 +00:00
Code Issues Releases Wiki Activity

Merge pull request #203 from jruderman/f11

Browse Source 
Raging Bull can no longer push Princess onto player's cell
This commit is contained in:
Zeno Rogue 2021-07-10 09:47:15 +02:00 committed by GitHub
commit bc6e1bd978
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monstermove.cpp
View File

@ -659,7 +659,7 @@ EX void beastAttack(cell *c, bool player, bool targetdir) {
if(c2->monst && c2->stuntime) { if(c2->monst && c2->stuntime) {
cellwalker bull (c, d); cellwalker bull (c, d);
int subdir = determinizeBullPush(bull); int subdir = determinizeBullPush(bull);
auto mi = determinePush(bull, subdir, [c2] (movei mi) { return passable(mi.t, c2, P_BLOW); }); auto mi = determinePush(bull, subdir, [c2] (movei mi) { return passable(mi.t, c2, P_BLOW) && !isPlayerOn(mi.t); });
if(mi.proper()) if(mi.proper())
pushMonster(mi); pushMonster(mi);
} }