mirror of
				https://github.com/zenorogue/hyperrogue.git
				synced 2025-10-26 03:17:39 +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:
		| @@ -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); | ||||||
|         } |         } | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Zeno Rogue
					Zeno Rogue