From 9c8f4d1fadf642d3c53bbace344fee59bbd70d5a Mon Sep 17 00:00:00 2001
From: "Derek S. Ray" <derekray@gmail.com>
Date: Wed, 29 Apr 2015 19:07:24 -0400
Subject: [PATCH] ensure that the 'safe' objects remain safe

since Elbereth doesn't work if you're not on the square anymore, we need
to make sure that critters are discouraged from grabbing the sokoban
prize or the castle wand.

also, fix up the level compiler makefiles so that uncommenting the
YACC/LEX definitions (presuming you have the right tools installed)
works properly.
---
 dat/castle.des         |  3 ++-
 dat/sokoban.des        |  4 +++-
 win/win32/dgnstuff.mak | 42 +++++++++++++++++++++++++-----------------
 win/win32/levstuff.mak | 30 +++++++++++-------------------
 4 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/dat/castle.des b/dat/castle.des
index 17f5e9f5c..bab8cec0a 100644
--- a/dat/castle.des
+++ b/dat/castle.des
@@ -1,4 +1,4 @@
-# NetHack 3.5	castle.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	castle.des	$NHDT-Date: 1430348677 2015/04/29 23:04:37 $  $NHDT-Branch: derek-elbereth $:$NHDT-Revision: 1.8 $
 # NetHack 3.5	castle.des	$Date: 2009/05/06 10:44:18 $  $Revision: 1.5 $
 #	SCCS Id: @(#)castle.des	3.5	2002/05/02
 #	Copyright (c) 1989 by Jean-Christophe Collet
@@ -143,6 +143,7 @@ OBJECT:('/',"wishing")
 }
 # Prevent monsters from eating it.  (@'s never eat objects)
 ENGRAVING:$place[0],burn,"Elbereth"
+OBJECT:('?',"scare monster"),$place[0],cursed
 # The treasure of the lord
 OBJECT:('(',"chest"),(37,08)
 # Traps
diff --git a/dat/sokoban.des b/dat/sokoban.des
index 343e895d6..16ea85f32 100644
--- a/dat/sokoban.des
+++ b/dat/sokoban.des
@@ -1,4 +1,4 @@
-# NetHack 3.5	sokoban.des	$NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
+# NetHack 3.5	sokoban.des	$NHDT-Date: 1430348694 2015/04/29 23:04:54 $  $NHDT-Branch: derek-elbereth $:$NHDT-Revision: 1.11 $
 # NetHack 3.5	sokoban.des	$Date: 2009/05/06 10:44:24 $  $Revision: 1.5 $
 #	SCCS Id: @(#)sokoban.des	3.5	1999/03/15
 #	Copyright (c) 1998-1999 by Kevin Hugo
@@ -535,6 +535,7 @@ IF [50%] {
   OBJECT:('"',"amulet of reflection"),$place[0]
 }
 ENGRAVING:$place[0],burn,"Elbereth"
+OBJECT:('?', "scare monster"),$place[0],cursed
 
 
 MAZE:"soko1-2",' '
@@ -635,3 +636,4 @@ IF [50%] {
   OBJECT:('"',"amulet of reflection"),$place[0]
 }
 ENGRAVING:$place[0],burn,"Elbereth"
+OBJECT:('?', "scare monster"),$place[0],cursed
diff --git a/win/win32/dgnstuff.mak b/win/win32/dgnstuff.mak
index a23aadfd8..004a0621b 100644
--- a/win/win32/dgnstuff.mak
+++ b/win/win32/dgnstuff.mak
@@ -1,27 +1,22 @@
 # $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
 # $Date: 2002/01/22 22:54:54 $  $Revision: 1.3 $
 
-#Set all of these or none of them
-#YACC   = byacc.exe
-#LEX	= flex.exe
-#YTABC   = y_tab.c
-#YTABH   = y_tab.h
-#LEXYYC  = lexyy.c
+# Set all of these or none of them.
+#
+# bison and flex are the ones found in GnuWin32, which
+# is probably the easiest set of these tools to find
+# on Windows.
+# 
+#YACC    = bison.exe -y
+#LEX     = flex.exe 
+#YTABC   = y.tab.c 
+#YTABH   = y.tab.h 
+#LEXYYC  = lex.yy.c 
 
-!IF "$(YACC)"!=""
-@echo Yacc-alike set to $(YACC)
-@echo YTABC set to $(YTABC)
-@echo YTABH set to $(YTABH)
-!ENDIF
-
-!IF "$(LEX)"!=""
-@echo Lex-alike set to $(LEX)
-@echo LEXYYC set to $(LEXYYC)
-!ENDIF
 
 default: all
 
-all: ..\util\dgn_yacc.c ..\util\dgn_lex.c
+all: tools ..\util\dgn_yacc.c ..\util\dgn_lex.c
 
 rebuild: clean all
 
@@ -30,6 +25,19 @@ clean:
 	-del ..\util\dgn_yacc.c
 	-del ..\include\dgn_comp.h
 
+tools:
+!IFDEF YACC
+	@echo Yacc-alike set to $(YACC)
+	@echo YTABC set to $(YTABC)
+	@echo YTABH set to $(YTABH)
+!ENDIF
+
+!IFDEF LEX
+	@echo Lex-alike set to $(LEX)
+	@echo LEXYYC set to $(LEXYYC)
+!ENDIF
+
+
 #==========================================
 # Dungeon Compiler Stuff
 #==========================================
diff --git a/win/win32/levstuff.mak b/win/win32/levstuff.mak
index 2597e5eb7..7f549abcd 100644
--- a/win/win32/levstuff.mak
+++ b/win/win32/levstuff.mak
@@ -1,26 +1,18 @@
 # $NHDT-Date$  $NHDT-Branch$:$NHDT-Revision$
 # $Date:2002/01/22 22:54:54 $  $Revision: 1.2 $
-#YACC   = byacc.exe
-#LEX	= flex.exe
-#YTABC   = y_tab.c
-#YTABH   = y_tab.h
-#LEXYYC  = lexyy.c
 
-!IF "$(YACC)"!=""
-@echo Yacc-alike set to $(YACC)
-@echo YTABC set to $(YTABC)
-@echo YTABH set to $(YTABH)
-!ENDIF
+# Set all of these or none of them.
+#
+# bison and flex are the ones found in GnuWin32, which
+# is probably the easiest set of these tools to find
+# on Windows.
+#
+#YACC    = bison.exe -y
+#LEX     = flex.exe
+#YTABC   = y.tab.c
+#YTABH   = y.tab.h
+#LEXYYC  = lex.yy.c
 
-!IF "$(LEX)"!=""
-@echo Lex-alike set to $(LEX)
-@echo LEXYYC set to $(LEXYYC)
-!ENDIF
-
-# these won't have an impact unless YACC/LEX are defined
-YTABC = y.tab.c
-YTABH = y.tab.h
-LEXYYC = lex.yy.c
 
 default: all