summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Schinagl <oliver@schinagl.nl>2008-01-08 20:52:33 (GMT)
committerOliver Schinagl <oliver@schinagl.nl>2008-01-08 20:52:33 (GMT)
commit5ca469e284321902ec0f8fe98880dfc7d1dcec56 (patch)
tree8f327cca51a67233a950e2f359e3ae5b55de843b
parentc3c41f66a48f40ae3471155ac302cc78175b5eac (diff)
download2iv35-5ca469e284321902ec0f8fe98880dfc7d1dcec56.zip
2iv35-5ca469e284321902ec0f8fe98880dfc7d1dcec56.tar.gz
2iv35-5ca469e284321902ec0f8fe98880dfc7d1dcec56.tar.bz2
improved error handling of when file not found. quake.bmp ..not found revert to arrow.bmp for now
-rw-r--r--Smoke/renderer_gl.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/Smoke/renderer_gl.c b/Smoke/renderer_gl.c
index 5e6bb95..3fde744 100644
--- a/Smoke/renderer_gl.c
+++ b/Smoke/renderer_gl.c
@@ -45,7 +45,7 @@
#define LEGEND_Y_POS -295.0f
#define LEGEND_Z_POS -735.0f
-#define BITMAP_SOURCE "quake.bmp"
+#define BITMAP_SOURCE "arrow.bmp"
#define BITMAP_FILESIZE 0x02
#define BITMAP_OFFSET 0x0a
#define BITMAP_HEADERSIZE 0x0e
@@ -323,7 +323,7 @@ GLuint LoadTextures(char *filename)
return_value = 0;
bitmap = fopen(filename, "rb");
- if (bitmap) {
+ if (bitmap > 0) {
unsigned int dataoffset, filesize;
GLsizei width, height;
unsigned char *imagedata;
@@ -352,10 +352,9 @@ GLuint LoadTextures(char *filename)
return_value = texture;
free(imagedata);
+ fclose(bitmap);
}
- fclose(bitmap);
-
return return_value;
}