From 6ee962b8ab6450433f4d756e20e57042284a9ff6 Mon Sep 17 00:00:00 2001 From: christoph Date: Tue, 4 Aug 2009 02:11:44 +0200 Subject: [PATCH] Removed the old package declarations. Split the level-editor into an own package, so the game itself doesnt have so much dependencies. --- leveleditor.lisp | 20 ++++++++++---------- uxul-world-leveleditor.asd | 15 +++++++++++++++ uxul-world-leveleditor.lisp | 6 ++++++ uxul-world.asd | 6 +----- package.lisp => uxul-world.lisp | 0 5 files changed, 32 insertions(+), 15 deletions(-) create mode 100644 uxul-world-leveleditor.asd create mode 100644 uxul-world-leveleditor.lisp rename package.lisp => uxul-world.lisp (100%) diff --git a/leveleditor.lisp b/leveleditor.lisp index 5a7808c..72c53df 100644 --- a/leveleditor.lisp +++ b/leveleditor.lisp @@ -1,6 +1,6 @@ ;;; Copyright 2009 Christoph Senjak -(in-package :uxul-world) +(in-package :uxul-world-leveleditor) (defparameter *leveleditor-images* nil) @@ -15,15 +15,15 @@ (defun prepare-base64-images (&optional (care-about-initialization *leveleditor-images*)) (when (not care-about-initialization) (setf *leveleditor-images* (make-hash-table)) - (setf (gethash 'uxul *leveleditor-images*) (stretched-base64-image |uxul_small1|)) - (setf (gethash 'leaf *leveleditor-images*) (stretched-base64-image |leaf|)) - (setf (gethash 'nasobem *leveleditor-images*) (stretched-base64-image |nasobem|)) - (setf (gethash 'blue-nasobem *leveleditor-images*) (stretched-base64-image |blue_nasobem|)) - (setf (gethash 'burning-marshmallow *leveleditor-images*) (stretched-base64-image |burning_marshmallow_ld1|)) - (setf (gethash 'gray-stone *leveleditor-images*) (stretched-base64-image |gray_stone|)) - (setf (gethash 'brown-stone *leveleditor-images*) (stretched-base64-image |brown_stone|)) - (setf (gethash 'empty *leveleditor-images*) (stretched-base64-image |empty|)) - (setf (gethash 'tulip *leveleditor-images*) (stretched-base64-image |tulip|)))) + (setf (gethash 'uxul *leveleditor-images*) (stretched-base64-image uxul-world::|uxul_small1|)) + (setf (gethash 'leaf *leveleditor-images*) (stretched-base64-image uxul-world::|leaf|)) + (setf (gethash 'nasobem *leveleditor-images*) (stretched-base64-image uxul-world::|nasobem|)) + (setf (gethash 'blue-nasobem *leveleditor-images*) (stretched-base64-image uxul-world::|blue_nasobem|)) + (setf (gethash 'burning-marshmallow *leveleditor-images*) (stretched-base64-image uxul-world::|burning_marshmallow_ld1|)) + (setf (gethash 'gray-stone *leveleditor-images*) (stretched-base64-image uxul-world::|gray_stone|)) + (setf (gethash 'brown-stone *leveleditor-images*) (stretched-base64-image uxul-world::|brown_stone|)) + (setf (gethash 'empty *leveleditor-images*) (stretched-base64-image uxul-world::|empty|)) + (setf (gethash 'tulip *leveleditor-images*) (stretched-base64-image uxul-world::|tulip|)))) (defun load-image-into-tk (png-base64) "return a tkobject with this image" diff --git a/uxul-world-leveleditor.asd b/uxul-world-leveleditor.asd new file mode 100644 index 0000000..2ea18f5 --- /dev/null +++ b/uxul-world-leveleditor.asd @@ -0,0 +1,15 @@ +;;; -*- lisp -*- + +;;; Copyright 2009 Christoph Senjak + +(defsystem "uxul-world-leveleditor" + :description "Uxul World Leveleditor" + :version "No Release Yet" + :author "Christoph Senjak " + :license "Copyright 2009 Christoph Senjak." + :depends-on (#:uxul-world + #:ltk + #:lisp-magick) + :components ((:file "uxul-world-leveleditor") + (:file "leveleditor")) + :serial t) \ No newline at end of file diff --git a/uxul-world-leveleditor.lisp b/uxul-world-leveleditor.lisp new file mode 100644 index 0000000..0a2b8ca --- /dev/null +++ b/uxul-world-leveleditor.lisp @@ -0,0 +1,6 @@ +;;; Copyright 2009 Christoph Senjak + +(defpackage #:uxul-world-leveleditor + (:use + #:cl #:uxul-world) + (:export #:level-editor)) diff --git a/uxul-world.asd b/uxul-world.asd index ce8f70b..155cd02 100755 --- a/uxul-world.asd +++ b/uxul-world.asd @@ -9,17 +9,13 @@ :license "Copyright 2009 Christoph Senjak." :depends-on (#:lispbuilder-sdl #:closer-mop #:cl-fad - ;#:asdf - #:ltk - #:lisp-magick #:lispbuilder-sdl-image) - :components ((:file "package") + :components ((:file "uxul-world") (:file "macros") (:file "constants") (:file "xy-coordinates") (:file "collision") (:file "files") - (:file "leveleditor") (:file "animation") (:file "functions") (:file "game-object") diff --git a/package.lisp b/uxul-world.lisp similarity index 100% rename from package.lisp rename to uxul-world.lisp -- 2.20.1