X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=verbs.lisp;h=7704ce39d994d9c8d6b0484e83927e91a35eb0da;hb=0b54e760a0bb4044372a2407ee959b37952d3e4d;hp=a6e4dd4d69cb8d78e7094faf781d87f45fada3ac;hpb=5ebd9d0215f32872bba84b52c697e23b0b7d444b;p=lifp.git

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)))