nzp-team/fteqw
0
0
Fork 0
mirror of https://github.com/nzp-team/fteqw.git synced 2024-11-10 14:42:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Just fixing some warnings.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1445 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2005-10-07 02:13:15 +00:00
parent e8b2cc11a9
commit b73f794d7d
4 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
engine/gl/gl_model.c
View file

@ -46,6 +46,9 @@ extern char loadname[32]; // for hunk tags
void CM_Init(void); void CM_Init(void);
void GLMod_LoadCompositeAnim(model_t *mod, void *buffer);
void GL_LoadHeightmapModel (model_t *mod, void *buffer);
void GLMod_LoadDarkPlacesModel(model_t *mod, void *buffer);
void GLMod_LoadSpriteModel (model_t *mod, void *buffer); void GLMod_LoadSpriteModel (model_t *mod, void *buffer);
void GLMod_LoadSprite2Model (model_t *mod, void *buffer); void GLMod_LoadSprite2Model (model_t *mod, void *buffer);
void GLMod_LoadBrushModel (model_t *mod, void *buffer); void GLMod_LoadBrushModel (model_t *mod, void *buffer);

4
engine/gl/gl_ppl.c
View file

@ -299,7 +299,7 @@ static void PPL_BaseChain_NoBump_1TMU(msurface_t *first, texture_t *tex)
qglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); qglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
} }
static void PPL_BaseChain_NoBump_2TMU(msurface_t *s, texture_t *tex) /*static void PPL_BaseChain_NoBump_2TMU(msurface_t *s, texture_t *tex)
{ //doesn't merge surfaces, but tells gl to do each vertex arrayed surface individually, which means no vertex copying. { //doesn't merge surfaces, but tells gl to do each vertex arrayed surface individually, which means no vertex copying.
int vi; int vi;
glRect_t *theRect; glRect_t *theRect;
@ -370,7 +370,7 @@ static void PPL_BaseChain_NoBump_2TMU(msurface_t *s, texture_t *tex)
GL_SelectTexture(GL_TEXTURE0_ARB); GL_SelectTexture(GL_TEXTURE0_ARB);
qglDisableClientState(GL_TEXTURE_COORD_ARRAY); qglDisableClientState(GL_TEXTURE_COORD_ARRAY);
} }*/
static void PPL_BaseChain_NoBump_2TMU_Overbright(msurface_t *s, texture_t *tex) static void PPL_BaseChain_NoBump_2TMU_Overbright(msurface_t *s, texture_t *tex)
{ //doesn't merge surfaces, but tells gl to do each vertex arrayed surface individually, which means no vertex copying. { //doesn't merge surfaces, but tells gl to do each vertex arrayed surface individually, which means no vertex copying.

7
engine/gl/glquake.h
View file

@ -256,6 +256,13 @@ extern qboolean gl_mtexable;
void GL_DisableMultitexture(void); void GL_DisableMultitexture(void);
void GL_EnableMultitexture(void); void GL_EnableMultitexture(void);
void GL_SelectTexture (GLenum target); void GL_SelectTexture (GLenum target);
void GL_SetShaderState2D(qboolean is2d);
void R_DrawRailCore(entity_t *e);
void R_DrawLightning(entity_t *e);
void R_DrawBeam( entity_t *e );
void P_FlushRenderer(void);
// //
// vid_gl*.c // vid_gl*.c

1
engine/gl/shader.h
View file

@ -232,6 +232,7 @@ void R_RenderMeshGeneric ( meshbuffer_t *mb, shaderpass_t *pass );
void R_RenderMeshCombined ( meshbuffer_t *mb, shaderpass_t *pass ); void R_RenderMeshCombined ( meshbuffer_t *mb, shaderpass_t *pass );
void R_RenderMeshMultitextured ( meshbuffer_t *mb, shaderpass_t *pass ); void R_RenderMeshMultitextured ( meshbuffer_t *mb, shaderpass_t *pass );
shader_t *R_RegisterPic (char *name);
shader_t *R_RegisterShader (char *name); shader_t *R_RegisterShader (char *name);
shader_t *R_RegisterShader_Vertex (char *name); shader_t *R_RegisterShader_Vertex (char *name);
shader_t *R_RegisterShader_Flare (char *name); shader_t *R_RegisterShader_Flare (char *name);