rolling boulder trap's boulder can be generated in lava

> On 01/30/2012 08:20 PM, <Someone> wrote:
> The boulder from a rolling boulder trap can be generated on a
> lava pool. mkroll_launch() in trap.c, line 1584 checks only for pools
> of water.
This commit is contained in:
nethack.allison
2012-02-01 00:49:16 +00:00
parent 28aace3fd4
commit e701a68175
8 changed files with 23 additions and 13 deletions

View File

@@ -199,8 +199,7 @@ const char *fmt, *arg;
}
check_strangling(TRUE);
if(!Levitation && !u.ustuck &&
(is_pool(u.ux,u.uy) || is_lava(u.ux,u.uy)))
if(!Levitation && !u.ustuck && is_pool_or_lava(u.ux,u.uy))
spoteffects(TRUE);
see_monsters();
@@ -746,7 +745,7 @@ int mntmp;
}
find_ac();
if((!Levitation && !u.ustuck && !Flying &&
(is_pool(u.ux,u.uy) || is_lava(u.ux,u.uy))) ||
is_pool_or_lava(u.ux,u.uy)) ||
(Underwater && !Swimming))
spoteffects(TRUE);
if (Passes_walls && u.utrap &&