From 4e862e361b89bd9131800add0e3e92bbc3f206bf Mon Sep 17 00:00:00 2001 From: Bradley Bell Date: Thu, 20 May 2004 23:38:20 +0000 Subject: [PATCH] fix a couple of defines --- ChangeLog | 2 ++ arch/ogl/gr.c | 4 ++-- main/menu.c | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ddba4047..0f89a6f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2004-05-20 Bradley Bell + * arch/ogl/gr.c, main/menu.c: fix a couple of defines + * main/inferno.c: integrated some niceautomap stuff from d1x 2004-05-20 Matthew Mueller diff --git a/arch/ogl/gr.c b/arch/ogl/gr.c index 9b10a6da..1f8a1133 100644 --- a/arch/ogl/gr.c +++ b/arch/ogl/gr.c @@ -1,4 +1,4 @@ -/* $Id: gr.c,v 1.24 2004-05-20 07:47:28 btb Exp $ */ +/* $Id: gr.c,v 1.25 2004-05-20 23:38:18 btb Exp $ */ /* * * OGL video functions. - Added 9/15/99 Matthew Mueller @@ -178,7 +178,7 @@ void ogl_get_verinfo(void) ogl_gettexlevelparam_ok = 1; ogl_setgammaramp_ok = 1; -#if 0 //WGL only, I think +#ifdef WGL_VIDEO dglMultiTexCoord2fARB = (glMultiTexCoord2fARB_fp)wglGetProcAddress("glMultiTexCoord2fARB"); dglActiveTextureARB = (glActiveTextureARB_fp)wglGetProcAddress("glActiveTextureARB"); dglMultiTexCoord2fSGIS = (glMultiTexCoord2fSGIS_fp)wglGetProcAddress("glMultiTexCoord2fSGIS"); diff --git a/main/menu.c b/main/menu.c index e9f91511..a9536b8d 100644 --- a/main/menu.c +++ b/main/menu.c @@ -1,4 +1,4 @@ -/* $Id: menu.c,v 1.36 2004-05-20 01:44:09 btb Exp $ */ +/* $Id: menu.c,v 1.37 2004-05-20 23:38:20 btb Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -1430,7 +1430,7 @@ void d2x_options_menu() #ifdef __MSDOS__ Joy_is_Sidewinder=m[(checks+0)].value; #endif -#ifdef __LINUX__ +#ifdef __linux__ Joy_is_Sidewinder=0; #endif #ifdef SUPPORTS_NICEFPS -- 2.39.2