Fix some warnings.

This commit is contained in:
Bill Currie 2012-01-07 23:11:56 +09:00
parent aa27a3f49c
commit 655252a506
3 changed files with 4 additions and 2 deletions

View file

@ -370,6 +370,7 @@ Draw_Init (void)
int i;
int frag, vert;
qpic_t *pic;
glpic_t *gl;
pic_cache = Hash_NewTable (127, cachepic_getkey, cachepic_free, 0);
QFS_GamedirCallback (Draw_ClearCache);
@ -420,7 +421,8 @@ Draw_Init (void)
white_pic = pic_data ("white_block", 8, 8, white_block);
backtile_pic = Draw_PicFromWad ("backtile");
qfglBindTexture (GL_TEXTURE_2D, ((glpic_t *) backtile_pic->data)->texnum);
gl = (glpic_t *) backtile_pic->data;
qfglBindTexture (GL_TEXTURE_2D, gl->texnum);
qfglTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
qfglTexParameterf (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
}

View file

@ -48,7 +48,6 @@ static __attribute__ ((used)) const char rcsid[] = "$Id$";
#include "QF/GLSL/defines.h"
#include "QF/GLSL/funcs.h"
#include "QF/GLSL/qf_alias.h"
#include "QF/GLSL/qf_lightmap.h"
#include "QF/GLSL/qf_textures.h"
#include "QF/GLSL/qf_vid.h"

View file

@ -375,6 +375,7 @@ GL_SubpicDelete (subpic_t *subpic)
*t = rect->next;
do {
merge = 0;
for (t = &scrap->free_rects; *t; t = &(*t)->next) {
merge = VRect_Merge (*t, rect);
if (merge) {