(no commit message)

[gacela.git] / gacela.lisp

diff --git a/gacela.lisp b/gacela.lisp
index 36817cf427ea21f349065d70a12ff77e271ea57a..4197d22d077e2b488fc7f692d48285aced148848 100644 (file)
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -15,19 +15,12 @@
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-(eval-when (compile)
-          (make-package 'gacela :nicknames '(gg) :use '(lisp))
-          (in-package 'gacela :nicknames '(gg) :use '(lisp)))
-
-;(eval-when (load)
-;         (make-package 'gacela :nicknames '(gg) :use '(lisp))
-;         (in-package 'gacela :nicknames '(gg) :use '(lisp)))
+(eval-when (compile load) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
 
-(when (not (find-package 'gacela))
-  (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)))
 
-;(eval-when (compile) (make-package 'gacela :nicknames '(gg) :use '(lisp)))
-(eval-when (eval load) (in-package 'gacela :nicknames '(gg) :use '(lisp)))
 
 ;;; Default values for Gacela
 (defvar *width-screen* 640)
@@ -74,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)
@@ -145,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 ()
@@ -161,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)))
 
@@ -276,23 +275,24 @@
      (init-video-mode)
      (set-game-code game-function)
      (cond ((not (game-running?))
-           (init-frame-time)
-           (process-events)
            (game-loop)))))
 
 (let (running game-code)
   (defun game-loop ()
     (setq running t)
     (do () ((quit?))
-       (glClear (+ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT))
-       (to-origin)
-       (when (functionp game-code) (funcall game-code))
-       (SDL_GL_SwapBuffers)
-       (delay-frame)
        (init-frame-time)
        (check-connections)
        (eval-from-clients)
-       (process-events))
+       (process-events)
+       (cond ((not (quit?))
+              (glClear (+ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT))
+              (to-origin)
+              (refresh-active-objects)
+              (when (functionp game-code) (funcall game-code))
+              (render-objects)
+              (SDL_GL_SwapBuffers)
+              (delay-frame))))
     (setq running nil))
 
   (defun game-running? ()
@@ -303,9 +303,10 @@
 
 (defun quit-game ()
   (free-all-resources)
-;  (quit-audio)
+  (quit-audio)
   (quit-video-mode)
-  (quit-all-mobs)
+;  (quit-all-mobs)
+  (kill-all-objects)
 ;  (clear-events)
 ;  (quit-events)
   (quit-sdl))