open,close

[lifp.git] / iflib.lisp

diff --git a/iflib.lisp b/iflib.lisp
index 39f4d507fba3e2b4064417124cc01a289d74af05..853d89d22a1b94182d99650ab67cbc9c0a181900 100644 (file)
--- a/iflib.lisp
+++ b/iflib.lisp
@@ -79,10 +79,16 @@
   "Turns passed since beginning of the game")\r
 \r
 (defparameter *player* nil\r
-  "Current player object (will be initialised later")\r
+  "Current player object (will be initialised later)")\r
 \r
 (declare-predicate add-to-scope add-to-outscope found-in seen-from)\r
 \r
+\r
+;;Library file names\r
+(defvar *library-file-if* "if.fas")\r
+(defvar *library-file-iflib* "iflib.fas")\r
+(defvar *library-file-verbs* "verbs.fas") \r
+\r
 ;;SECTION 2: Library-defined classes and objects\r
 \r
 (ifclass container () (capacity integer) (has :container))\r
@@ -634,12 +640,12 @@
 (defun lib (file dir)\r
   "Reloads the IF library" \r
   (format t "[DIRECTORY: ~a]~%" dir)\r
-  (print-message "Loading if.fas...")\r
-  (load (merge-pathnames dir "if.fas"))\r
-  (print-message "Loading iflib.fas...") \r
-  (load (merge-pathnames dir "iflib.fas"))\r
-  (print-message "Loading verbs.fas...") \r
-  (load (merge-pathnames dir "verbs.fas"))\r
+  (print-message "Loading if-basic-lib...")\r
+  (load (merge-pathnames dir *library-file-if*))\r
+  (print-message "Loading if-lib...") \r
+  (load (merge-pathnames dir *library-file-iflib*))\r
+  (print-message "Loading verbs...") \r
+  (load (merge-pathnames dir *library-file-verbs*))\r
   (print-message "Loading game module...") \r
   (load file)\r
   (print-message "Module is successfully loaded."))\r
@@ -675,7 +681,7 @@
   `(defpackage ,name\r
     (:use :common-lisp :if-basic-lib :if-lib :verb-lib ,@other-packages)\r
     (:shadowing-import-from :if-lib :room)\r
-    (:shadowing-import-from :verb-lib :listen :fill)))\r
+    (:shadowing-import-from :verb-lib :listen :fill :open :close)))\r
 \r
 (defmacro free-symbol (id)\r
   "Frees a symbol from current package using shadow"\r