mirror of
https://github.com/zenorogue/hyperrogue.git
synced 2024-12-26 01:50:36 +00:00
Merge pull request #203 from jruderman/f11
Raging Bull can no longer push Princess onto player's cell
This commit is contained in:
commit
bc6e1bd978
@ -659,7 +659,7 @@ EX void beastAttack(cell *c, bool player, bool targetdir) {
|
||||
if(c2->monst && c2->stuntime) {
|
||||
cellwalker bull (c, d);
|
||||
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())
|
||||
pushMonster(mi);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user