diff options
author | Oliver Schinagl <oliver@schinagl.nl> | 2008-01-09 22:35:07 (GMT) |
---|---|---|
committer | Oliver Schinagl <oliver@schinagl.nl> | 2008-01-09 22:35:07 (GMT) |
commit | c66a1ba1d72dd14d072bd1972c40ed31c377b291 (patch) | |
tree | ad83241d0444317bdb45b5d514bb5f012fd2194b | |
parent | 2d0b4b6fc8e9528e9ad3ee260e64d4ecb5f83bb4 (diff) | |
download | 2iv35-c66a1ba1d72dd14d072bd1972c40ed31c377b291.zip 2iv35-c66a1ba1d72dd14d072bd1972c40ed31c377b291.tar.gz 2iv35-c66a1ba1d72dd14d072bd1972c40ed31c377b291.tar.bz2 |
no header file included, not exported via header file
-rw-r--r-- | Smoke/glyphs.c | 5 | ||||
-rw-r--r-- | Smoke/renderer_gl.c | 2 | ||||
-rw-r--r-- | Smoke/renderer_gl.h | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/Smoke/glyphs.c b/Smoke/glyphs.c index 13fdb0b..33f941d 100644 --- a/Smoke/glyphs.c +++ b/Smoke/glyphs.c @@ -9,6 +9,7 @@ #include "funcs.h"
#include "fluids.h"
#include "palette.h"
+#include "renderer_gl.h"
#include "glyphs.h"
@@ -90,11 +91,11 @@ void glyphs_set_sort(int sort) switch (glyphs_sort)
{
case GLYPH_ARROWS:
- load_textures("arrow.bmp");
+ renderer_load_texture("arrow.bmp");
break;
case GLYPH_QUAKE:
- load_textures("quake.bmp");
+ renderer_load_texture("quake.bmp");
break;
default:
diff --git a/Smoke/renderer_gl.c b/Smoke/renderer_gl.c index f52eba5..b26f119 100644 --- a/Smoke/renderer_gl.c +++ b/Smoke/renderer_gl.c @@ -63,7 +63,7 @@ static GLuint texture; -GLuint load_textures(char *filename) +GLuint renderer_load_texture(char *filename) { GLuint return_value; FILE *bitmap; diff --git a/Smoke/renderer_gl.h b/Smoke/renderer_gl.h index 00fcea3..0b4f196 100644 --- a/Smoke/renderer_gl.h +++ b/Smoke/renderer_gl.h @@ -21,6 +21,7 @@ void renderer_reset_yaw(void); void renderer_reset_pitch(void); void renderer_reset_roll(void); +GLuint renderer_load_texture(char *filename); extern float x_rot; extern float y_rot; |