[Emacs-diffs] trunk r117334: Changed Dunnet so that if a lamp is in the room that would otherwise be dark, the player will not

[Ron Schnell]

------------------------------------------------------------
revno: 117334
revision-id: address@hidden
parent: address@hidden
committer: Ron Schnell <address@hidden>
branch nick: trunk
timestamp: Sat 2014-06-14 16:57:34 -0400
message:
  Changed Dunnet so that if a lamp is in the room that would otherwise be dark, 
the player will not
  be eaten by a grue.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/play/dunnet.el            dunnet.el-20091113204419-o5vbwnq5f7feedwu-602

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-06-13 23:05:00 +0000
+++ b/lisp/ChangeLog    2014-06-14 20:57:34 +0000
@@ -1,3 +1,6 @@
+2014-06-14  Ron Schnell  <address@hidden>      
+       * play/dunnet.el If a lamp is in the room, you won't be eaten by a grue.
+       
 2014-06-13  Glenn Morris  <address@hidden>
 
        * Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el)

=== modified file 'lisp/play/dunnet.el'
--- a/lisp/play/dunnet.el       2014-01-01 07:43:34 +0000
+++ b/lisp/play/dunnet.el       2014-06-14 20:57:34 +0000
@@ -100,7 +100,8 @@
 
 (defun dun-describe-room (room)
   (if (and (not (member (abs room) dun-light-rooms))
-          (not (member obj-lamp dun-inventory)))
+          (not (member obj-lamp dun-inventory))
+          (not (member obj-lamp (nth dun-current-room dun-room-objects))))
       (dun-mprincl "It is pitch dark.  You are likely to be eaten by a grue.")
     (dun-mprincl (cadr (nth (abs room) dun-rooms)))
     (if (and (and (or (member room dun-visited)
@@ -615,7 +616,8 @@
 
 (defun dun-move (dir)
   (if (and (not (member dun-current-room dun-light-rooms))
-          (not (member obj-lamp dun-inventory)))
+          (not (member obj-lamp dun-inventory))
+          (not (member obj-lamp (nth dun-current-room dun-room-objects))))
       (progn
        (dun-mprinc
 "You trip over a grue and fall into a pit and break every bone in your