nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

rolling boulder trap's boulder can be generated in lava

Browse Source 
> 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
Download Patch File Download Diff File Expand all files Collapse all files

8
src/hack.c
View File

@@ -725,7 +725,7 @@ int mode;
if ((t && t->tseen) ||
(!Levitation && !Flying &&
!is_clinger(youmonst.data) &&
(is_pool(x, y) || is_lava(x, y)) && levl[x][y].seenv))
is_pool_or_lava(x, y) && levl[x][y].seenv))
return FALSE;
}
@@ -1222,7 +1222,7 @@ domove()
if (((trap = t_at(x, y)) && trap->tseen) ||
(Blind && !Levitation && !Flying &&
!is_clinger(youmonst.data) &&
(is_pool(x, y) || is_lava(x, y)) && levl[x][y].seenv)) {
is_pool_or_lava(x, y) && levl[x][y].seenv)) {
if(context.run >= 2) {
nomul(0);
context.move = 0;
@@ -1718,7 +1718,7 @@ boolean newspot; /* true if called by spoteffects */
/* check for entering water or lava */
if (!u.ustuck && !Levitation && !Flying &&
(is_pool(u.ux, u.uy) || is_lava(u.ux, u.uy))) {
is_pool_or_lava(u.ux, u.uy)) {
#ifdef STEED
if (u.usteed && (is_flyer(u.usteed->data) ||
is_floater(u.usteed->data) || is_clinger(u.usteed->data))) {
@@ -2309,7 +2309,7 @@ bcorr:
if(context.run == 1) goto bcorr; /* if you must */
if(x == u.ux+u.dx && y == u.uy+u.dy) goto stop;
continue;
} else if (is_pool(x,y) || is_lava(x,y)) {
} else if (is_pool_or_lava(x,y)) {
/* water and lava only stop you if directly in front, and stop
* you even if you are running
*/