From 6fc7d44345d90843687d1e486ff68cc33026dc5c Mon Sep 17 00:00:00 2001
From: cohrs <cohrs>
Date: Mon, 18 Mar 2002 07:30:48 +0000
Subject: [PATCH] better trap searching behavior - if a trap is hidden by
 clutter, cls() before delay, remove windowport specific behavior, makes trap
 more obvious in all cases

---
 src/detect.c | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/detect.c b/src/detect.c
index 0490b04de..60eda7083 100644
--- a/src/detect.c
+++ b/src/detect.c
@@ -1101,8 +1101,8 @@ find_trap(trap)
 struct trap *trap;
 {
     int tt = what_trap(trap->ttyp);
+    boolean cleared = FALSE;
 
-    You("find %s.", an(defsyms[trap_to_defsym(tt)].explanation));
     trap->tseen = 1;
     exercise(A_WIS, TRUE);
     if (Blind)
@@ -1112,24 +1112,17 @@ struct trap *trap;
 
     if (levl[trap->tx][trap->ty].glyph != trap_to_glyph(trap)) {
     	/* There's too much clutter to see your find otherwise */
-	if (!strncmpi(windowprocs.name, "tty", 3)) {
-		tmp_at(DISP_ALWAYS, trap_to_glyph(trap));
-		tmp_at(trap->tx, trap->ty);
-		display_nhwindow(WIN_MAP, TRUE);	/* wait */
-		tmp_at(DISP_END,0);
-	}
-#if 0
-	/* This could flash the trap in a future post-3.4.0 release? (untested) */
-	else {
-		int i, tglyph = levl[trap->tx][trap->ty].glyph;
-		for (i = 0; i < 4; i++) {
-			tmp_at(DISP_FLASH, trap_to_glyph(trap));
-			tmp_at(trap->tx, trap->ty);
-			delay_output();
-			tmp_at(DISP_END, 0);
-		}
-	}
-#endif
+	cls();
+	map_trap(trap, 1);
+	display_self();
+	cleared = TRUE;
+    }
+
+    You("find %s.", an(defsyms[trap_to_defsym(tt)].explanation));
+
+    if (cleared) {
+	display_nhwindow(WIN_MAP, TRUE);	/* wait */
+	docrt();
     }
 }