Dunnet patch - first since the '90s

Dunnet patch - first since the '90s

[Ron Schnell]

[-- Attachment #1: Type: text/plain, Size: 1285 bytes --]

Since this is my first patch, I am including it here before committing.
 Please advise if there are any issues.  It is one of many bugfixes that
have been reported to me over the years (this particular one was reported
in June 1996).

=== modified file 'lisp/play/dunnet.el'
--- lisp/play/dunnet.el 2014-01-01 07:43:34 +0000
+++ lisp/play/dunnet.el 2014-06-14 06:43:09 +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

-- 
Follow me on Twitter: http://twitter.com/RonnieSchnell

[-- Attachment #2: Type: text/html, Size: 1772 bytes --]

Re: Dunnet patch - first since the '90s

[Stefan Monnier]

> Since this is my first patch, I am including it here before committing.
>  Please advise if there are any issues.  It is one of many bugfixes that
> have been reported to me over the years (this particular one was reported
> in June 1996).

Looks fine, but please make sure you include a ChangeLog entry.


        Stefan

Re: Dunnet patch - first since the '90s

[Ron Schnell]

[-- Attachment #1: Type: text/plain, Size: 595 bytes --]

Okay, I had.  I've committed it, so if it looks like everything worked okay
I will get to fixing the rest.


On Sat, Jun 14, 2014 at 4:56 PM, Stefan Monnier <monnier@iro.umontreal.ca>
wrote:

> > Since this is my first patch, I am including it here before committing.
> >  Please advise if there are any issues.  It is one of many bugfixes that
> > have been reported to me over the years (this particular one was reported
> > in June 1996).
>
> Looks fine, but please make sure you include a ChangeLog entry.
>
>
>         Stefan
>



-- 
Follow me on Twitter: http://twitter.com/RonnieSchnell

[-- Attachment #2: Type: text/html, Size: 1156 bytes --]