Oops, needs to work for non-OpenGL 1.3 as well. ;)

This commit is contained in:
Ragnvald Maartmann-Moe IV 2001-12-28 21:47:32 +00:00
parent 377a168dea
commit e55fed2197

View file

@ -74,17 +74,17 @@ void GL_EnableMultitexture( qboolean enable )
if ( enable ) if ( enable )
{ {
GL_SelectTexture( GL_TEXTURE1 ); GL_SelectTexture( GL_Texture1 );
qglEnable( GL_TEXTURE_2D ); qglEnable( GL_TEXTURE_2D );
GL_TexEnv( GL_REPLACE ); GL_TexEnv( GL_REPLACE );
} }
else else
{ {
GL_SelectTexture( GL_TEXTURE1 ); GL_SelectTexture( GL_Texture1 );
qglDisable( GL_TEXTURE_2D ); qglDisable( GL_TEXTURE_2D );
GL_TexEnv( GL_REPLACE ); GL_TexEnv( GL_REPLACE );
} }
GL_SelectTexture( GL_TEXTURE0 ); GL_SelectTexture( GL_Texture0 );
GL_TexEnv( GL_REPLACE ); GL_TexEnv( GL_REPLACE );
} }
@ -95,7 +95,7 @@ void GL_SelectTexture( GLenum texture )
if ( !qglSelectTextureSGIS && !qglActiveTextureARB ) if ( !qglSelectTextureSGIS && !qglActiveTextureARB )
return; return;
if ( texture == GL_TEXTURE0 ) if ( texture == GL_Texture0 )
{ {
tmu = 0; tmu = 0;
} }
@ -148,7 +148,7 @@ void GL_Bind (int texnum)
void GL_MBind( GLenum target, int texnum ) void GL_MBind( GLenum target, int texnum )
{ {
GL_SelectTexture( target ); GL_SelectTexture( target );
if ( target == GL_TEXTURE0 ) if ( target == GL_Texture0 )
{ {
if ( gl_state.currenttextures[0] == texnum ) if ( gl_state.currenttextures[0] == texnum )
return; return;