From: grue Date: Sat, 22 Jul 2006 12:58:56 +0000 (+0000) Subject: bugfix X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=0b54e760a0bb4044372a2407ee959b37952d3e4d;p=lifp.git bugfix darcs-hash:588a176a5ac5a9e8520f0d0cf7aab7ab0aac9b42 --- diff --git a/console.lisp b/console.lisp index abca216..86588b1 100644 --- a/console.lisp +++ b/console.lisp @@ -153,7 +153,7 @@ (defun run-console (startup lib-loader &key (interactive nil)) (if *repl-mode* (progn (funcall startup) (return-from run-console t)) - (with-ltk () + (with-ltk (:debug :develop) (let* ((txt (make-instance 'text)) (menu (make-menubar)) (m-file (make-menu menu "File")) diff --git a/verbs.lisp b/verbs.lisp index a6e4dd4..7704ce3 100644 --- a/verbs.lisp +++ b/verbs.lisp @@ -18,7 +18,7 @@ :wear :strip :enter :climb :drink :eat :rub :turn :switch-on :switch-off :fill :empty :extract :let-go :open :close - :lock :unlock :open-unlock) + :lock :unlock :unlock-open) (:shadow :listen :fill :open :close) (:shadowing-import-from :if-lib :room)) @@ -501,12 +501,12 @@ (format nil "You cannot unlock ~a with ~a." (the-name obj) (the-name key)))))) -(defaction open-unlock (obj key) +(defaction unlock-open (obj key) "You cannot open this.") -(defmethod open-unlock ((obj container) (key item)) +(defmethod unlock-open ((obj container) (key item)) (unless (and (has obj :container) (has obj :openable)) - (return-from open-unlock (call-next-method))) + (return-from unlock-open (call-next-method))) (and (run-action 'unlock *args*) (run-action 'open obj)))