X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=gacela.lisp;h=299ab90b9a21b328337bde69d2a8b598a5742b4d;hb=bc04e12cf3c193c3b5620f3b6e0ded852f221fb8;hp=e009ec3187c5482c7294a491535e5bfd3d6a3e6a;hpb=f517b3fade078f0c4f00c0a665ea1fe04e3e1da5;p=gacela.git

diff --git a/gacela.lisp b/gacela.lisp
index e009ec3..299ab90 100644
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -15,7 +15,12 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(in-package :gacela :nicknames '(gg))
+(eval-when (compile load) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+
+(eval-when (compile load eval)
+	   (when (not (find-package 'gacela)) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
+	   (in-package 'gacela :nicknames '(gg) :use '(lisp)))
+
 
 ;;; Default values for Gacela
 (defvar *width-screen* 640)
@@ -62,13 +67,13 @@
     (setq screen nil)))
 
 (defun set-2d-mode ()
-  (cond ((3d-mode?)
+  (cond ((not (3d-mode?))
 	 (init-video-mode)
 	 (glDisable GL_DEPTH_TEST)
 	 (apply-mode-change))))
 
 (defun set-3d-mode ()
-  (cond ((not (3d-mode?))
+  (cond ((3d-mode?)
 	 (init-video-mode)
 	 (glClearDepth 1)
 	 (glEnable GL_DEPTH_TEST)
@@ -133,7 +138,7 @@
 (let ((audio nil))
 
   (defun init-audio ()
-    (cond ((null audio) (progn (init-sdl) (setq audio (Mix_OpenAudio 22050 2 4096))))
+    (cond ((null audio) (progn (init-sdl) (setq audio (Mix_OpenAudio 22050 MIX_DEFAULT_FORMAT 2 4096))))
 	  (t audio)))
 
   (defun quit-audio ()
@@ -149,6 +154,12 @@
 (defun make-resource-font (&key filename encoding)
   `(:type font :filename ,filename :enconding ,encoding))
 
+(defun make-resource-sound (&key filename)
+  `(:type sound :filename ,filename))
+
+(defun make-resource-music (&key filename)
+  `(:type music :filename ,filename))
+
 (defmacro get-rtime (key)
   `(resource-time (gethash ,key resources-table)))
 
@@ -291,7 +302,7 @@
 
 (defun quit-game ()
   (free-all-resources)
-;  (quit-audio)
+  (quit-audio)
   (quit-video-mode)
   (quit-all-mobs)
 ;  (clear-events)