From: U-christoph-TP\christoph <christoph@christoph-TP.(none)>
Date: Mon, 16 Aug 2010 18:22:03 +0000 (+0200)
Subject: removed dependency on sdl-image, using sdl only. added copyright-notice for bmp.lisp
X-Git-Url: http://uxul.de/gitweb/?a=commitdiff_plain;h=074a5863f985bd9a078f41af96310fd55828df3f;p=uxul-world.git

removed dependency on sdl-image, using sdl only. added copyright-notice for bmp.lisp
---

diff --git a/animation.lisp b/animation.lisp
index 3d86d5b..ec09fc4 100755
--- a/animation.lisp
+++ b/animation.lisp
@@ -132,26 +132,25 @@ images-variable."
   (make-instance 'animation
 		 :images-2x (mapcar
 			     #'(lambda (x)
-				 (sdl:convert-surface :surface (sdl-image:load-image
-								(car x)
-								:image-type :BMP :alpha 1 )))
+				 (sdl:convert-surface :surface (sdl:load-image
+								(car x) :alpha 1 )))
 			     image-list)
 		 :images-1x (mapcar
 			     #'(lambda (x)
-				 (sdl:convert-surface :surface (sdl-image:load-image
+				 (sdl:convert-surface :surface (sdl:load-image
 								(cadr x)
-								:image-type :BMP :alpha 1 )))
+								:alpha 1 )))
 			     image-list)
 		 :images-.5x (mapcar
 			     #'(lambda (x)
-				 (sdl:convert-surface :surface (sdl-image:load-image
+				 (sdl:convert-surface :surface (sdl:load-image
 								(caddr x)
-								:image-type :BMP :alpha 1 )))
+								:alpha 1 )))
 			     image-list)
 		 :images-.25x (mapcar
 			     #'(lambda (x)
-				 (sdl:convert-surface :surface (sdl-image:load-image
+				 (sdl:convert-surface :surface (sdl:load-image
 								(cadddr x)
-								:image-type :BMP :alpha 1 )))
+								:alpha 1 )))
 			     image-list)
 		 :sprite-delay frame-skip))
\ No newline at end of file
diff --git a/bmp.lisp b/bmp.lisp
index 51faca9..0b05d55 100755
--- a/bmp.lisp
+++ b/bmp.lisp
@@ -1,7 +1,8 @@
-(in-package :uxul-world)
+;;; -*- lisp -*-
 
+;;; Copyright 2010 Christoph Senjak
 
-;; this should go into functions.lisp
+(in-package :uxul-world)
 
 (defun intersection-interval (a b c d)
   "We assume a<b and c<d. Compute the intersection-interval between
@@ -287,4 +288,4 @@ image-data (for efficiency-reasons)."
 		   (b (as-alpha-value
 		       (elt cpix 0) (elt background-rgb 0) alpha))
 		  )
-	      (format out "~d ~d ~d~%" r g b))))))))
\ No newline at end of file
+	      (format out "~d ~d ~d~%" r g b))))))))
diff --git a/uxul-world.asd b/uxul-world.asd
index 9190c77..bb9f515 100755
--- a/uxul-world.asd
+++ b/uxul-world.asd
@@ -9,7 +9,7 @@
   :license "Copyright 2009 Christoph Senjak."
   :depends-on (#:lispbuilder-sdl #:closer-mop
 				 #:cl-fad
-                                 #:lispbuilder-sdl-image)
+                                 #:lispbuilder-sdl)
   :components ((:file "uxul-world")
                (:file "constants")
                (:file "macros")