aboutsummaryrefslogtreecommitdiffstats
path: root/code/unix/linux_glimp.c
diff options
context:
space:
mode:
authoricculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea>2005-11-26 07:46:21 +0000
committericculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea>2005-11-26 07:46:21 +0000
commit441c7633e0aa67faa91dc5896ee83e6c29de0ba6 (patch)
treeed6f97f0be5940123e9e3f244ae91a475787ff64 /code/unix/linux_glimp.c
parentb0c6a473e2a34000db73c75bc0ff43bba45fddb2 (diff)
downloadioquake3-aero-441c7633e0aa67faa91dc5896ee83e6c29de0ba6.tar.gz
ioquake3-aero-441c7633e0aa67faa91dc5896ee83e6c29de0ba6.zip
Mac OS X work...lots of little changes that touch a lot of random places.
Still work to be done, but this at least matches the PowerPC Linux status now. MacOS-specific directory (and XCode project) is gone...this now uses SDL, OpenAL, and the Unix Makefiles. --ryan. git-svn-id: svn://svn.icculus.org/quake3/trunk@373 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/unix/linux_glimp.c')
-rw-r--r--code/unix/linux_glimp.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/code/unix/linux_glimp.c b/code/unix/linux_glimp.c
index 3c35c74..a72c50a 100644
--- a/code/unix/linux_glimp.c
+++ b/code/unix/linux_glimp.c
@@ -1265,7 +1265,9 @@ static void GLW_InitExtensions( void )
if ( qglActiveTextureARB )
{
- qglGetIntegerv( GL_MAX_ACTIVE_TEXTURES_ARB, &glConfig.maxActiveTextures );
+ GLint glint = 0;
+ qglGetIntegerv( GL_MAX_ACTIVE_TEXTURES_ARB, &glint );
+ glConfig.maxActiveTextures = (int) glint;
if ( glConfig.maxActiveTextures > 1 )
{