Ok, removed all the #define's and everything should be working fine now.

notify me of any bugs :)
--
Eric Windisch

common/gl_vidlinux_3dfx.c

@@ -48,6 +48,8 @@ static fxMesaContext fc = NULL;
 static int	scr_width, scr_height;
 static qboolean is8bit = 0;
 
+int	options_items = 13;
+
 /*-----------------------------------------------------------------------*/
 
 //int	texture_mode = GL_NEAREST;
@@ -436,16 +438,18 @@ void VID_Init(unsigned char *palette)
 	vid.recalc_refdef = 1;				// force a surface cache flush
 }
 
-
+void VID_ExtraOptionDraw(void)
-void
-VID_ExtraOptionDraw(void)
 {
-	/* No extra option menu items yet */
+/* Port specific Options menu entrys */
 }
-
+ 
-
+void VID_ExtraOptionCmd(int option_cursor)
-void
-VID_ExtraOptionCmd(int options_cursor)
 {
-	/* No extra option menu items yet */
+/*
+        switch(option_cursor)
+        {
+        case 12:  // Always start with 12
+        break;
+        }
+*/
 }

common/gl_vidlinuxglx.c

@@ -40,10 +40,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #ifdef XMESA
 #include <GL/xmesa.h>
-
-#define OPTIONS_ITEMS	15
-#else
-#define OPTIONS_ITEMS   14
 #endif
 
 #define WARP_WIDTH              320
@@ -80,6 +76,12 @@ cvar_t	m_filter = {"m_filter", "0"};
 
 static int scr_width, scr_height;
 
+#ifdef XMESA
+int options_items = 15;
+#else
+int options_items = 14;
+#endif
+
 /*-----------------------------------------------------------------------*/
 
 //int		texture_mode = GL_NEAREST;

common/gl_vidnt.c

@@ -40,8 +40,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define NO_MODE					(MODE_WINDOWED - 1)
 #define MODE_FULLSCREEN_DEFAULT	(MODE_WINDOWED + 1)
 
-#define OPTIONS_ITEMS	14
-
 typedef struct {
 	modestate_t	type;
 	int			width;
@@ -103,6 +101,8 @@ static qboolean fullsbardraw = false;
 
 static float vid_gamma = 1.0;
 
+int 	options_items = 14;
+
 HGLRC	baseRC;
 HDC		maindc;
 

common/vid_dos.c

@@ -58,6 +58,8 @@ cvar_t		block_switch = {"block_switch","0", true};
 cvar_t		vid_window_x = {"vid_window_x", "0", true};
 cvar_t		vid_window_y = {"vid_window_y", "0", true};
 
+int     options_items = 13;
+
 int	d_con_indirect = 0;
 
 int		numvidmodes;

common/vid_ggi.c

@@ -69,6 +69,7 @@ static long GGI_highhunkmark, GGI_buffersize;
 static int	vid_surfcachesize;
 static void	*vid_surfcache;
 
+int     options_items = 14;
 
 static void
 do_scale8(int xsize, int ysize, uint8 *dest, uint8 *src)

common/vid_null.c

@@ -30,7 +30,7 @@ viddef_t	vid;				// global video state
 #define	BASEHEIGHT	200
 
 // Number of items in the options menu: none extra is 13
-#define OPTIONS_ITEMS	13
+int     options_items = 13;
 
 byte	vid_buffer[BASEWIDTH*BASEHEIGHT];
 short	zbuffer[BASEWIDTH*BASEHEIGHT];

common/vid_sdl.c

@@ -40,6 +40,8 @@ unsigned short  d_8to16table[256];
 int    VGA_width, VGA_height, VGA_rowbytes, VGA_bufferrowbytes = 0;
 byte    *VGA_pagebase;
 
+int	options_items = 14;
+
 static SDL_Surface *screen = NULL;
 
 static qboolean mouse_avail;

common/vid_sunx.c

@@ -55,6 +55,8 @@ int p_mouse_x;
 int p_mouse_y;
 qboolean	mouse_grabbed = false; // we grab it when console is up
 
+int     options_items = 14;
+
 // The following X property format is defined in Motif 1.1's
 // Xm/MwmUtils.h, but QUAKE should not depend on that header
 // file. Note: Motif 1.2 expanded this structure with

common/vid_sunxil.c

@@ -132,6 +132,7 @@ Window				x_win, x_root_win;
 qboolean			x_focus = true;
 int				global_dx, global_dy;
 
+int     options_items = 14;
 
 static Colormap			x_cmap;
 static GC			x_gc;

common/vid_svgalib.c

@@ -654,6 +654,12 @@ VID_ExtraOptionDraw(void)
 void
 VID_ExtraOptionCmd(int option_cursor)
 {
-	/* No extra option menu items yet */
+/*
+        switch(option_cursor)
+        {
+        case 12:  // Always start with 12
+        break;
+        }
+*/
 }
 

common/vid_win.c

@@ -145,6 +145,8 @@ int		aPage;					// Current active display page
 int		vPage;					// Current visible display page
 int		waitVRT = true;			// True to wait for retrace on flip
 
+int     options_items = 14;
+
 static vmode_t	badmode;
 
 static byte	backingbuf[48*24];

common/vid_x.c

@@ -42,8 +42,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "quakedef.h"
 #include "d_local.h"
 
-#define OPTIONS_ITEMS	14
-
 cvar_t		_windowed_mouse = {"_windowed_mouse","0", true};
 cvar_t		m_filter = {"m_filter","0", true};
 float old_windowed_mouse;
@@ -95,6 +93,8 @@ static XShmSegmentInfo	x_shminfo[2];
 
 static int verbose=0;
 
+int     options_items = 14;
+
 static byte current_palette[768];
 
 static long X11_highhunkmark;

uquake/menu.c

@@ -1065,10 +1065,11 @@ again:
 //=============================================================================
 /* OPTIONS MENU */
 
-#ifndef OPTIONS_ITEMS
+/*
-#define OPTIONS_ITEMS   13
+ifndef options_items
-#endif 
+define options_items   13
-
+endif 
+*/
 
 
 #define	SLIDER_RANGE	10
@@ -1297,14 +1298,14 @@ void M_Options_Key (int k)
 		S_LocalSound ("misc/menu1.wav");
 		options_cursor--;
 		if (options_cursor < 0)
-			options_cursor = OPTIONS_ITEMS-1;
+			options_cursor = options_items-1;
 		break;
 
 	case KP_DOWNARROW:
 	case K_DOWNARROW:
 		S_LocalSound ("misc/menu1.wav");
 		options_cursor++;
-		if (options_cursor >= OPTIONS_ITEMS)
+		if (options_cursor >= options_items)
 			options_cursor = 0;
 		break;
 
@@ -1320,24 +1321,24 @@ void M_Options_Key (int k)
 	}
 
 #ifndef _WIN32
-	if (options_cursor == OPTIONS_ITEMS-1 && vid_menudrawfn == NULL)
+	if (options_cursor == options_items-1 && vid_menudrawfn == NULL)
 	{
 	    switch (k) {
 		case KP_UPARROW:
 		case K_UPARROW:
-		    options_cursor = OPTIONS_ITEMS-2;
+		    options_cursor = options_items-2;
 		    break;
 		default:
 		    options_cursor = 0;
 	    }
 	}
 #else
-	if ((options_cursor == OPTIONS_ITEMS-1) && (modestate != MS_WINDOWED))
+	if ((options_cursor == options_items-1) && (modestate != MS_WINDOWED))
 	{
 	    switch (k) {
 		case KP_UPARROW:
 		case K_UPARROW:
-		    options_cursor = OPTIONS_ITEMS-2;
+		    options_cursor = options_items-2;
 		    break;
 		default:
 		    options_cursor = 0;

uquake/menu.h

@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define	MNET_TCP		2
 
 extern	int	m_activenet;
-
+extern  int	options_items;
 //
 // menus
 //