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

Merge branch 'NetHack-3.6.2'

Browse Source
This commit is contained in:
nhmall
2019-02-23 12:16:13 -05:00
parent 453a2a041d 56a33d43da
commit 42e7f6fcba
8 changed files with 78 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dothrow.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 dothrow.c $NHDT-Date: 1550784489 2019/02/21 21:28:09 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.157 $ */
/* NetHack 3.6 dothrow.c $NHDT-Date: 1550868876 2019/02/22 20:54:36 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.158 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Robert Patrick Rankin, 2013. */
/* NetHack may be freely redistributed. See license for details. */
@@ -380,10 +380,12 @@ dofire()
You("have nothing appropriate for your quiver.");
}
/* if autoquiver is disabled or has failed, prompt for missile;
fill quiver with it if it's not wielded */
fill quiver with it if it's not wielded or worn */
if (!obj) {
/* direction of previous throw is not suitable answer here */
g.in_doagain = FALSE;
/* in case we're using ^A to repeat prior 'f' command, don't
use direction of previous throw as getobj()'s choice here */
g.in_doagain = 0;
/* choose something from inventory, then usually quiver it */
obj = getobj(uslinging() ? bullets : toss_objs, "throw");
/* Q command doesn't allow gold in quiver */
if (obj && !obj->owornmask && obj->oclass != COIN_CLASS)

2
src/mklev.c
View File

@@ -1400,7 +1400,7 @@ coord *tm;
in a pit and yet not be able to identify that the pit is there. */
if (kind != NO_TRAP && lvl <= (unsigned) rnd(4)
&& kind != SQKY_BOARD && kind != RUST_TRAP
/* rolling bounder trap might not have a boulder if there was no
/* rolling boulder trap might not have a boulder if there was no
viable path (such as when placed in the corner of a room), in
which case tx,ty==launch.x,y; no boulder => no dead predecessor */
&& !(kind == ROLLING_BOULDER_TRAP