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

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-08-30 22:11:44 -04:00
parent 0359f8fa45 3e0d029a45
commit a36792162c
19 changed files with 78 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/display.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 display.c $NHDT-Date: 1560085863 2019/06/09 13:11:03 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.104 $ */
/* NetHack 3.6 display.c $NHDT-Date: 1567213890 2019/08/31 01:11:30 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.106 $ */
/* Copyright (c) Dean Luick, with acknowledgements to Kevin Darcy */
/* and Dave Cohrs, 1990. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1368,15 +1368,15 @@ docrt()
if (u.uswallow) {
swallowed(1);
return;
goto post_map;
}
if (Underwater && !Is_waterlevel(&u.uz)) {
under_water(1);
return;
goto post_map;
}
if (u.uburied) {
under_ground(1);
return;
goto post_map;
}
/* shut down vision */
@@ -1403,6 +1403,8 @@ docrt()
/* overlay with monsters */
see_monsters();
post_map:
/* perm_invent */
update_inventory();

22
src/invent.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 invent.c $NHDT-Date: 1562203850 2019/07/04 01:30:50 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.261 $ */
/* NetHack 3.6 invent.c $NHDT-Date: 1567213892 2019/08/31 01:11:32 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.262 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Derek S. Ray, 2015. */
/* NetHack may be freely redistributed. See license for details. */
@@ -2393,6 +2393,26 @@ learn_unseen_invent()
update_inventory();
}
/* persistent inventory window is maintained by interface code;
'update_inventory' used to be a macro for
(*windowprocs.win_update_inventory) but the restore hackery
was getting out of hand; this is now a central call point */
void
update_inventory()
{
if (restoring)
return;
/*
* Ought to check (windowprocs.wincap2 & WC2_PERM_INVENT) here....
*
* We currently don't skip this call when iflags.perm_invent is False
* because curses uses that to disable a previous perm_invent window
* (after toggle via 'O'; perhaps the options code should handle that).
*/
(*windowprocs.win_update_inventory)();
}
/* should of course only be called for things in invent */
static char
obj_to_let(obj)

2
src/mkmaze.c
View File

@@ -1392,7 +1392,7 @@ movebubbles()
struct bubble *b;
struct container *cons;
struct trap *btrap;
int x, y, i, j, bcpin;
int x, y, i, j, bcpin = 0;
/* set up the portal the first time bubbles are moved */
if (!g.wportal)

2
src/shk.c
View File

@@ -4815,7 +4815,7 @@ void
globby_bill_fixup(obj_absorber, obj_absorbed)
struct obj *obj_absorber, *obj_absorbed;
{
int x, y;
int x = 0, y = 0;
struct bill_x *bp, *bp_absorber = (struct bill_x *) 0;
struct monst *shkp = 0;
struct eshk *eshkp;