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

couple of DUNGEON_OVERVIEW fixes (trunk only)

Browse Source 
New hero would remember part of old one's terrain discoveries (such
as presence of fountains) for bones levels.  Also, some topology changes
(such as fountain destruction) can be detected by touch while blinded but
dungeon overview continued to remember the old feature.  Post-3.4.3 code.
This commit is contained in:
nethack.rankin
2007-06-26 03:10:39 +00:00
parent a7e312aedc
commit 7333ca4705
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bones.c
+4 -1
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)bones.c 3.5 2007/03/01 */ /* SCCS Id: @(#)bones.c 3.5 2007/06/25 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985,1993. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985,1993. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -371,6 +371,9 @@ struct obj *corpse;
levl[x][y].seenv = 0; levl[x][y].seenv = 0;
levl[x][y].waslit = 0; levl[x][y].waslit = 0;
levl[x][y].glyph = cmap_to_glyph(S_stone); levl[x][y].glyph = cmap_to_glyph(S_stone);
#ifdef DUNGEON_OVERVIEW
levl[x][y].styp = 0;
#endif
} }
fd = create_bonesfile(&u.uz, &bonesid, whynot); fd = create_bonesfile(&u.uz, &bonesid, whynot);
src/display.c
+12 -5
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)display.c 3.5 2007/01/26 */ /* SCCS Id: @(#)display.c 3.5 2007/06/25 */
/* Copyright (c) Dean Luick, with acknowledgements to Kevin Darcy */ /* Copyright (c) Dean Luick, with acknowledgements to Kevin Darcy */
/* and Dave Cohrs, 1990. */ /* and Dave Cohrs, 1990. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -133,6 +133,12 @@ STATIC_DCL void FDECL(set_seenv, (struct rm *, int, int, int, int));
STATIC_DCL void FDECL(t_warn, (struct rm *)); STATIC_DCL void FDECL(t_warn, (struct rm *));
STATIC_DCL int FDECL(wall_angle, (struct rm *)); STATIC_DCL int FDECL(wall_angle, (struct rm *));
#ifdef DUNGEON_OVERVIEW
# define remember_topology(levp) ((levp)->styp = (levp)->typ)
#else
# define remember_topology(levp) /*empty*/
#endif
#ifdef INVISIBLE_OBJECTS #ifdef INVISIBLE_OBJECTS
/* /*
* vobj_at() * vobj_at()
@@ -185,9 +191,8 @@ magic_map_background(x, y, show)
if (level.flags.hero_memory) if (level.flags.hero_memory)
lev->glyph = glyph; lev->glyph = glyph;
if (show) show_glyph(x,y, glyph); if (show) show_glyph(x,y, glyph);
#ifdef DUNGEON_OVERVIEW
lev->styp = lev->typ; remember_topology(lev); /* DUNGEON_OVERVIEW */
#endif /* DUNGEON_OVERVIEW */
} }
/* /*
@@ -343,6 +348,8 @@ unmap_object(x, y)
map_trap(trap,show); \ map_trap(trap,show); \
else \ else \
map_background(x,y,show); \ map_background(x,y,show); \
\
remember_topology(&levl[x][y]); /* DUNGEON_OVERVIEW */ \
} }
void void
@@ -523,7 +530,7 @@ feel_location(x, y)
/* if the hero is levitating or not. */ /* if the hero is levitating or not. */
set_seenv(lev, u.ux, u.uy, x, y); set_seenv(lev, u.ux, u.uy, x, y);
if (Levitation && !Is_airlevel(&u.uz) && !Is_waterlevel(&u.uz)) { if (!can_reach_floor(FALSE)) {
/* /*
* Levitation Rules. It is assumed that the hero can feel the state * Levitation Rules. It is assumed that the hero can feel the state
* of the walls around herself and can tell if she is in a corridor, * of the walls around herself and can tell if she is in a corridor,