From: slack <slack@codemaniacs.com>
Date: Sun, 30 Aug 2009 00:21:18 +0000 (+0200)
Subject: merge con los cambios de rafa
X-Git-Url: http://slack.codemaniacs.com/git/?a=commitdiff_plain;h=1d63b25c94a9c9d34570666b2eec2fb0e579686b;p=fov120.git

merge con los cambios de rafa
---

diff --git a/dl_init.h b/dl_init.h
index c461fd8..1db01d3 100644
--- a/dl_init.h
+++ b/dl_init.h
@@ -46,7 +46,6 @@ typedef struct
 	//void	(*glPushMatrix)(void);
 	//void	(*glPopMatrix)(void);
 	//void	(*glTexCoord2f)(GLfloat, GLfloat);
-	void	(*glBindTexture)(GLenum, GLuint);
 	void    (*glRecti)(GLint, GLint, GLint, GLint);
 	void	(*glClearColor)(GLfloat, GLfloat, GLfloat, GLfloat);
 	//void    (*glXUseXFont)(Font, int, int, int);
diff --git a/main.c b/main.c
index 2857f55..0f25cad 100644
--- a/main.c
+++ b/main.c
@@ -49,7 +49,7 @@ void initModels()
 
 void endRenderTexture() 
 {
-	fn.glBindTexture(renderTexture);
+	fn.glBindTexture(GL_TEXTURE_2D, renderTexture);
 	fn.glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
 }
 
@@ -92,7 +92,6 @@ void __attribute__((externally_visible)) _start(void)
 		fn.SDL_PollEvent(&event);
 	} while(event.type != SDL_KEYDOWN);
 
-end:
 	fn.SDL_Quit();
 
 #if 1