Skip to content

Commit

Permalink
sdkfjhkf
Browse files Browse the repository at this point in the history
  • Loading branch information
David O'Toole committed Dec 16, 2009
1 parent 8d3a451 commit 43e0143
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 15 deletions.
26 changes: 14 additions & 12 deletions console.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -782,22 +782,24 @@ resource is stored; see also `find-resource'."
*resource-table*)
val)))

(defvar *executable* nil)

(defvar *module-directories*
(list (make-pathname :directory
(pathname-directory
(make-pathname
:host (pathname-host #.(or *compile-file-truename*
*load-truename*))
:device (pathname-device #.(or *compile-file-truename*
(list (if *executable*
(make-pathname :directory (pathname-directory (car sb-ext:*posix-argv*)))
(make-pathname :directory
(pathname-directory
(make-pathname
:host (pathname-host #.(or *compile-file-truename*
*load-truename*))
:directory (pathname-directory #.(or *compile-file-truename*
*load-truename*))))))
;; (load-time-value
;; (or #.*compile-file-truename* *load-truename*))))
;; ;; auto-config via sb-ext
;; (make-pathname :directory (pathname-directory (car sb-ext:*posix-argv*))))
:device (pathname-device #.(or *compile-file-truename*
*load-truename*))
:directory (pathname-directory #.(or *compile-file-truename*
*load-truename*)))))))
"List of directories where XE2 will search for modules.
Directories are searched in list order.")
;; (load-time-value
;; (or #.*compile-file-truename* *load-truename*))))

(defun find-module-path (module-name)
"Search the `*module-directories*' path for a directory with the
Expand Down
Binary file modified forest/ascent-gateway.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 8 additions & 1 deletion forest/forest.org
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
* Essential
** TODO more stuff to look at on sanctuary level... sheep or something
** TODO more story stuff
** TODO forest exits should be able to be in any column
** TODO stop spamming with multiple narrator messages (2x)
** TODO move lich a little more quickly?
** TODO lich incantation distance attackk?
** TODO teleporting lich

* Polish
** TODO edible fruits to find
** TODO rose found in the forest
** TODO fix bubbles to stay onscreen, Lothaine etc


** TODO [#A] fix 100% cpu usage
*** WAITING talk to luke
Expand Down
3 changes: 2 additions & 1 deletion make-forest-image.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
(sb-posix:putenv
(format nil "SBCL_HOME=~A"
#.(sb-ext:posix-getenv "SBCL_HOME")))
(xe2:play "forest")
(let ((xe2:*executable* t))
(xe2:play "forest"))
0)
:executable t)

Expand Down
2 changes: 1 addition & 1 deletion xe2.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
formatted-string-width get-color create-image draw-image play
define-prototype has-field defcell *choose-direction-menu*
set-field-options field-option-value index-resource find-module-path
index-module load-image-resource load-lisp-resource
index-module load-image-resource load-lisp-resource *executable*
*resource-handlers* load-resource find-resource find-resource-object
*colors* *world* load-user-init-file *module-directories*
resource-to-plist make-event =widget= *active-widgets*
Expand Down

0 comments on commit 43e0143

Please sign in to comment.