X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=iflib.lisp;h=cfa4d1e358467ee3334024ef4b4ec904a57b4260;hb=0b54e760a0bb4044372a2407ee959b37952d3e4d;hp=0684f32c18e601843949eae2649459ac8d84539c;hpb=fce67b6af7ce71eecb134f00bf7bec731daef40f;p=lifp.git

diff --git a/iflib.lisp b/iflib.lisp
index 0684f32..cfa4d1e 100644
--- a/iflib.lisp
+++ b/iflib.lisp
@@ -27,7 +27,7 @@
 	   :u-to :d-to :cant-go
 	   :*intscope*  :*outscope* :*location* :*trace-light* :*vowels*
 	   :*score* :*gamestate* :*turns* :*dark*
-           :add-to-scope :add-to-outscope :found-in :seen-from
+           :add-to-scope :add-to-outscope :found-in :seen-from :with-keys
 	   :compass :dir-n :dir-ne :dir-e :dir-se :dir-s
 	   :dir-sw :dir-w :dir-nw :dir-u :dir-d :dir-in :dir-out
 	   :darkness :lit :transparent :passable
@@ -79,15 +79,15 @@
   "Turns passed since beginning of the game")
 
 (defparameter *player* nil
-  "Current player object (will be initialised later")
-
-(declare-predicate add-to-scope add-to-outscope found-in seen-from)
+  "Current player object (will be initialised later)")
 
+(declare-predicate add-to-scope add-to-outscope found-in seen-from
+                   with-keys)
 
 ;;Library file names
 (defvar *library-file-if* "if.fas")
-(defvar *library-file-iflib* "if.fas")
-(defvar *library-file-verbs* "if.fas") 
+(defvar *library-file-iflib* "iflib.fas")
+(defvar *library-file-verbs* "verbs.fas") 
 
 ;;SECTION 2: Library-defined classes and objects
 
@@ -681,7 +681,7 @@
   `(defpackage ,name
     (:use :common-lisp :if-basic-lib :if-lib :verb-lib ,@other-packages)
     (:shadowing-import-from :if-lib :room)
-    (:shadowing-import-from :verb-lib :listen :fill)))
+    (:shadowing-import-from :verb-lib :listen :fill :open :close)))
 
 (defmacro free-symbol (id)
   "Frees a symbol from current package using shadow"