bugfix

darcs-hash:588a176a5ac5a9e8520f0d0cf7aab7ab0aac9b42

diff --git a/console.lisp b/console.lisp
index abca2163c1c03f3484a8010161e4e0a038cd738e..86588b1815d8f115b207a42e35ed886040ca744d 100644 (file)
--- a/console.lisp
+++ b/console.lisp
@@ -153,7 +153,7 @@
 (defun run-console (startup lib-loader &key (interactive nil))\r
   (if *repl-mode* (progn (funcall startup) \r
                         (return-from run-console t))\r
-  (with-ltk ()\r
+  (with-ltk (:debug :develop)\r
       (let* ((txt (make-instance 'text))\r
             (menu (make-menubar))\r
             (m-file (make-menu menu "File"))\r

diff --git a/verbs.lisp b/verbs.lisp
index a6e4dd4d69cb8d78e7094faf781d87f45fada3ac..7704ce39d994d9c8d6b0484e83927e91a35eb0da 100644 (file)
--- a/verbs.lisp
+++ b/verbs.lisp
@@ -18,7 +18,7 @@
           :wear :strip :enter :climb :drink :eat\r
            :rub :turn :switch-on :switch-off\r
            :fill :empty :extract :let-go :open :close\r
-           :lock :unlock :open-unlock)\r
+           :lock :unlock :unlock-open)\r
   (:shadow :listen :fill :open :close)\r
   (:shadowing-import-from :if-lib :room))\r
 \r
@@ -501,12 +501,12 @@
               (format nil "You cannot unlock ~a with ~a."\r
                       (the-name obj) (the-name key))))))\r
 \r
-(defaction open-unlock (obj key)\r
+(defaction unlock-open (obj key)\r
   "You cannot open this.")\r
 \r
-(defmethod open-unlock ((obj container) (key item))\r
+(defmethod unlock-open ((obj container) (key item))\r
   (unless (and (has obj :container) \r
                (has obj :openable))\r
-    (return-from open-unlock (call-next-method)))\r
+    (return-from unlock-open (call-next-method)))\r
   (and (run-action 'unlock *args*)\r
        (run-action 'open obj)))\r