projects
/
lifp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2624b20
)
more door bugs
author
grue
<grue@mail.ru>
Wed, 2 Aug 2006 11:12:36 +0000
(11:12 +0000)
committer
grue
<grue@mail.ru>
Wed, 2 Aug 2006 11:12:36 +0000
(11:12 +0000)
darcs-hash:
a57c7fb82732c79c3881f19d360475bef78413a1
iflib.lisp
patch
|
blob
|
history
verbs.lisp
patch
|
blob
|
history
diff --git
a/iflib.lisp
b/iflib.lisp
index 0154b718e83198fb3af6b7c2042da93f41f87c8e..4ba5b5dfde16d40b7918bf717fd7fcf78a7e8ae0 100644
(file)
--- a/
iflib.lisp
+++ b/
iflib.lisp
@@
-100,7
+100,7
@@
(n-to object) (ne-to object) (e-to object) (se-to object)
\r
(s-to object) (sw-to object) (w-to object) (nw-to object)
\r
(u-to object) (d-to object) (in-to object) (out-to object)
\r
(n-to object) (ne-to object) (e-to object) (se-to object)
\r
(s-to object) (sw-to object) (w-to object) (nw-to object)
\r
(u-to object) (d-to object) (in-to object) (out-to object)
\r
- (cant-go string)
\r
+ ;(cant-go string) <- doesn't provide by default
\r
(has :light :enterable))
\r
\r
(ifclass item () (description string) (article string)
\r
(has :light :enterable))
\r
\r
(ifclass item () (description string) (article string)
\r
@@
-356,7
+356,7
@@
\r
(defun default-glance (obj)
\r
"Default initial description of object"
\r
\r
(defun default-glance (obj)
\r
"Default initial description of object"
\r
- (format t "[Default glance for ~a]~%" obj)
\r
+
;;
(format t "[Default glance for ~a]~%" obj)
\r
(sprint "~a~%"
\r
(with-output-to-string (out)
\r
(princ "There is " out) (princ (print-name obj) out)
\r
(sprint "~a~%"
\r
(with-output-to-string (out)
\r
(princ "There is " out) (princ (print-name obj) out)
\r
diff --git
a/verbs.lisp
b/verbs.lisp
index 5b090e6e9769ab15b3cec62695be9c8745500ca8..dae175a5644a93a7833bd3569050444561a78563 100644
(file)
--- a/
verbs.lisp
+++ b/
verbs.lisp
@@
-205,7
+205,7
@@
\r
(defaction go-to (dir)
\r
(let ((destination (read-property *location* (property dir))))
\r
\r
(defaction go-to (dir)
\r
(let ((destination (read-property *location* (property dir))))
\r
- (if destination (exec go-to-dispatch (destination))
\r
+ (if destination (exec go-to-dispatch (destination)
:str t
)
\r
(if (provides *location* 'cant-go)
\r
(read-property *location* 'cant-go)
\r
"You can't go here."))))
\r
(if (provides *location* 'cant-go)
\r
(read-property *location* 'cant-go)
\r
"You can't go here."))))
\r
@@
-217,9
+217,10
@@
(go-to-room dest))
\r
\r
(defmethod go-to-dispatch ((dest door))
\r
(go-to-room dest))
\r
\r
(defmethod go-to-dispatch ((dest door))
\r
+ ;(format t "go-to-dispatch: ~a~%" dest)
\r
(unless (has dest :door) (return-from go-to-dispatch (call-next-method)))
\r
(if (has dest :closed) (format nil "~a is closed." (the-name dest :capital t))
\r
(unless (has dest :door) (return-from go-to-dispatch (call-next-method)))
\r
(if (has dest :closed) (format nil "~a is closed." (the-name dest :capital t))
\r
- (run-action 'pass
*args*
)))
\r
+ (run-action 'pass
(list dest)
)))
\r
\r
(defaction pass (obj)
\r
"Something's wrong happened.")
\r
\r
(defaction pass (obj)
\r
"Something's wrong happened.")
\r