Commit 85cff943 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(dun-climb): Handle unknown object name.

(dun-objnames): Add "palm" as alias for "tree".
parent dbabfd55
......@@ -422,19 +422,22 @@ For an explosive time, go to Fourth St. and Vermont.")
(defun dun-climb (obj)
(let (objnum)
(setq objnum (dun-objnum-from-args obj))
(if (and (not (= objnum obj-special))
(not (member objnum (nth dun-current-room dun-room-objects)))
(not (member objnum (nth dun-current-room dun-room-silents)))
(not (member objnum dun-inventory)))
(dun-mprincl "I don't see that here.")
(if (and (= objnum obj-special)
(not (member obj-tree (nth dun-current-room dun-room-silents))))
(dun-mprincl "There is nothing here to climb.")
(if (and (not (= objnum obj-tree)) (not (= objnum obj-special)))
(dun-mprincl "You can't climb that.")
(dun-mprincl
"You manage to get about two feet up the tree and fall back down. You
notice that the tree is very unsteady."))))))
(cond ((null objnum)
(dun-mprincl "I don't know that name."))
((and (not (eq objnum obj-special))
(not (member objnum (nth dun-current-room dun-room-objects)))
(not (member objnum (nth dun-current-room dun-room-silents)))
(not (member objnum dun-inventory)))
(dun-mprincl "I don't see that here."))
((and (eq objnum obj-special)
(not (member obj-tree (nth dun-current-room dun-room-silents))))
(dun-mprincl "There is nothing here to climb."))
((and (not (eq objnum obj-tree)) (not (eq objnum obj-special)))
(dun-mprincl "You can't climb that."))
(t
(dun-mprincl
"You manage to get about two feet up the tree and fall back down. You
notice that the tree is very unsteady.")))))
(defun dun-eat (obj)
(let (objnum)
......@@ -2096,7 +2099,7 @@ A hole leads north."
(floppy . 27) (disk . 27)
(boulder . -1)
(tree . -2) (trees . -2)
(tree . -2) (trees . -2) (palm . -2)
(bear . -3)
(bin . -4) (bins . -4)
(cabinet . -5) (computer . -5) (vax . -5) (ibm . -5)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment