updates to hallucinatory trap names and fixes37.0 entry

diff --git a/doc/fixes37.0 b/doc/fixes37.0
index 2e2f93d51f27c8638eb5cb797790b59bce2bb561..d5e47aaf6f3c132eb602f2cdfe229110f5fe8a55 100644 (file)
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -32,6 +32,7 @@ Platform- and/or Interface-Specific New Features
 
 NetHack Community Patches (or Variation) Included
 -------------------------------------------------
+hallucinatory trap names from github pull request #174
 
 
 Code Cleanup and Reorganization

diff --git a/src/apply.c b/src/apply.c
index cd99d5d5b3070d7a0c4ef4e830a5dd1e98145f97..d197be8e38cc23a715ada7e69db4a3a977b7f148 100644 (file)
--- a/src/apply.c
+++ b/src/apply.c
@@ -2513,7 +2513,6 @@ struct obj *otmp;
         You("aren't very skilled at reaching from %s.", mon_nam(u.usteed));
         Sprintf(buf, "Continue your attempt to set %s?",
                 the(trapname(ttyp, FALSE)));
-                    .explanation));
         if (yn(buf) == 'y') {
             if (chance) {
                 switch (ttyp) {

diff --git a/src/detect.c b/src/detect.c
index 7c29ac2088e3340ce0fabb96b32081f18fc26a8d..f2e08aa0fa1742834290ba285c0fb4c153124bf8 100644 (file)
--- a/src/detect.c
+++ b/src/detect.c
@@ -1616,8 +1616,7 @@ struct trap *trap;
        behaviour might need a rework in the hallucination case
        (e.g. to not prompt if any trap glyph appears on the square). */
     if (Hallucination ||
-        levl[trap->tx][trap->ty].glyph !=
-        trap_to_glyph(trap, rn2_on_display_rng)) {
+        levl[trap->tx][trap->ty].glyph != trap_to_glyph(trap)) {
         /* There's too much clutter to see your find otherwise */
         cls();
         map_trap(trap, 1);
@@ -1864,7 +1863,7 @@ int default_glyph, which_subset;
              || glyph_is_invisible(glyph))
             && keep_traps && !covers_traps(x, y)) {
             if ((t = t_at(x, y)) != 0 && t->tseen)
-                glyph = trap_to_glyph(t, rn2_on_display_rng);
+                glyph = trap_to_glyph(t);
         }
         if ((glyph_is_object(glyph) && !keep_objs)
             || (glyph_is_trap(glyph) && !keep_traps)

diff --git a/src/display.c b/src/display.c
index 48e3cc96b4040ad049c6480a3aae5f4356a95f6d..fc8977f01d84e43602a6c4301e7f4c7d3484bb57 100644 (file)
--- a/src/display.c
+++ b/src/display.c
@@ -228,7 +228,7 @@ register struct trap *trap;
 register int show;
 {
     register int x = trap->tx, y = trap->ty;
-    register int glyph = trap_to_glyph(trap, newsym_rn2);
+    register int glyph = trap_to_glyph(trap);
 
     if (g.level.flags.hero_memory)
         levl[x][y].glyph = glyph;