From b63a5e5672e858e7a3689ebc4d66853d5151dfb6 Mon Sep 17 00:00:00 2001
From: jsancho <devnull@localhost>
Date: Thu, 17 Dec 2009 01:13:33 +0000
Subject: [PATCH]
---
Makefile | 3 ++-
gacela.lisp | 2 +-
gacela_SDL.lisp | 6 ------
gacela_draw.lisp | 2 +-
4 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index d0cbb68..f38a6d7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
LISP = gcl
INC = -I/usr/include/FTGL -I/usr/include/freetype2
-LIBS = -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer -lSDL_gfx -lGL -lGLU -lftgl
+# LIBS = -lSDL -lSDL_image -lSDL_ttf -lSDL_mixer -lSDL_gfx -lGL -lGLU -lftgl
+LIBS = -lSDL -lSDL_image -lSDL_mixer -lGL -lGLU -lftgl
OBJ = gacela.o gacela_misc.o gacela_SDL.o gacela_GL.o gacela_FTGL.o \
gacela_draw.o gacela_ttf.o gacela_events.o gacela_mobs.o \
diff --git a/gacela.lisp b/gacela.lisp
index 4501060..895bb38 100644
--- a/gacela.lisp
+++ b/gacela.lisp
@@ -267,7 +267,7 @@
(do () ((quit?))
(glClear (+ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT))
(glLoadIdentity)
-(gluLookAt 0 0 50 0 0 0 0 1 0)
+;(gluLookAt 0 0 50 0 0 0 0 1 0)
(when (functionp game-code) (funcall game-code))
(SDL_GL_SwapBuffers)
(delay-frame)
diff --git a/gacela_SDL.lisp b/gacela_SDL.lisp
index 6ff5c1b..6f3376e 100644
--- a/gacela_SDL.lisp
+++ b/gacela_SDL.lisp
@@ -29,9 +29,7 @@
(clines "#include <SDL/SDL.h>")
(clines "#include <SDL/SDL_image.h>")
-(clines "#include <SDL/SDL_ttf.h>")
(clines "#include <SDL/SDL_mixer.h>")
-(clines "#include <SDL/SDL_rotozoom.h>")
;;; SDL constants as functions
(mapcconst int "int" "SDL_INIT_TIMER")
@@ -140,9 +138,6 @@
(defcfun "int gacela_SDL_EnableKeyRepeat (int delay, int interval)" 0
"return SDL_EnableKeyRepeat (delay, interval);")
-(defcfun "int gacela_zoomSurface (int src, float zoomx, float zoomy, int smooth)" 0
- "return zoomSurface (src, zoomx, zoomy, smooth);")
-
(defcfun "int gacela_SDL_ByteOrder (void)" 0
"return SDL_BYTEORDER;")
@@ -185,7 +180,6 @@
;(defentry free (int) (void "gacela_free"))
(defentry SDL_GL_SwapBuffers () (void "gacela_SDL_GL_SwapBuffers"))
(defentry SDL_EnableKeyRepeat (int int) (int "gacela_SDL_EnableKeyRepeat"))
-(defentry zoomSurface (int float float int) (int "gacela_zoomSurface"))
(defentry SDL_ByteOrder () (int "gacela_SDL_ByteOrder"))
;;; C-Gacela Functions
diff --git a/gacela_draw.lisp b/gacela_draw.lisp
index 4b6f58f..d992ba5 100644
--- a/gacela_draw.lisp
+++ b/gacela_draw.lisp
@@ -128,7 +128,7 @@
(defun draw-square (&key (size 1) texture)
(draw-rectangle size size :texture texture))
-(defun draw-cube (&key size texture texture-1 texture-2 texture-3 texture-4 texture-5 texture-6)
+(defun draw-cube (&key (size 1) texture texture-1 texture-2 texture-3 texture-4 texture-5 texture-6)
(let ((-size (neg size)))
(progn-textures
(glNormal3f 0 0 1)
--
2.39.5