From 8e689739f426e01b696ff346b54a6eb9a198e42e Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Thu, 11 Aug 2011 03:57:23 +0000 Subject: [PATCH] Removed "Color Depth" from q3_ui system settings, it didn't control anything. --- code/q3_ui/ui_video.c | 74 ++++--------------------------------------- 1 file changed, 6 insertions(+), 68 deletions(-) diff --git a/code/q3_ui/ui_video.c b/code/q3_ui/ui_video.c index de248420..d37a8149 100644 --- a/code/q3_ui/ui_video.c +++ b/code/q3_ui/ui_video.c @@ -270,7 +270,6 @@ typedef struct { menulist_s lighting; menulist_s allow_extensions; menulist_s texturebits; - menulist_s colordepth; menulist_s geometry; menulist_s filter; menutext_s driverinfo; @@ -285,7 +284,6 @@ typedef struct qboolean fullscreen; int tq; int lighting; - int colordepth; int texturebits; int geometry; int filter; @@ -299,22 +297,22 @@ static graphicsoptions_t s_graphicsoptions; static InitialVideoOptions_s s_ivo_templates[] = { { - 6, qtrue, 3, 0, 2, 2, 2, 1, 0, qtrue + 6, qtrue, 3, 0, 2, 2, 1, 0, qtrue }, { - 4, qtrue, 2, 0, 2, 2, 1, 1, 0, qtrue // JDC: this was tq 3 + 4, qtrue, 2, 0, 2, 1, 1, 0, qtrue // JDC: this was tq 3 }, { - 3, qtrue, 2, 0, 0, 0, 1, 0, 0, qtrue + 3, qtrue, 2, 0, 0, 1, 0, 0, qtrue }, { - 2, qtrue, 1, 0, 1, 0, 0, 0, 0, qtrue + 2, qtrue, 1, 0, 0, 0, 0, 0, qtrue }, { - 2, qtrue, 1, 1, 1, 0, 0, 0, 0, qtrue + 2, qtrue, 1, 1, 0, 0, 0, 0, qtrue }, { - 3, qtrue, 1, 0, 0, 0, 1, 0, 0, qtrue + 3, qtrue, 1, 0, 0, 1, 0, 0, qtrue } }; @@ -468,7 +466,6 @@ GraphicsOptions_GetInitialVideo */ static void GraphicsOptions_GetInitialVideo( void ) { - s_ivo.colordepth = s_graphicsoptions.colordepth.curvalue; s_ivo.driver = s_graphicsoptions.driver.curvalue; s_ivo.mode = s_graphicsoptions.mode.curvalue; s_ivo.fullscreen = s_graphicsoptions.fs.curvalue; @@ -520,8 +517,6 @@ static void GraphicsOptions_CheckConfig( void ) for ( i = 0; i < NUM_IVO_TEMPLATES-1; i++ ) { - if ( s_ivo_templates[i].colordepth != s_graphicsoptions.colordepth.curvalue ) - continue; if ( s_ivo_templates[i].driver != s_graphicsoptions.driver.curvalue ) continue; if ( GraphicsOptions_FindDetectedResolution(s_ivo_templates[i].mode) != s_graphicsoptions.mode.curvalue ) @@ -557,23 +552,12 @@ static void GraphicsOptions_UpdateMenuItems( void ) { s_graphicsoptions.fs.curvalue = 1; s_graphicsoptions.fs.generic.flags |= QMF_GRAYED; - s_graphicsoptions.colordepth.curvalue = 1; } else { s_graphicsoptions.fs.generic.flags &= ~QMF_GRAYED; } - if ( s_graphicsoptions.fs.curvalue == 0 || s_graphicsoptions.driver.curvalue == 1 ) - { - s_graphicsoptions.colordepth.curvalue = 0; - s_graphicsoptions.colordepth.generic.flags |= QMF_GRAYED; - } - else - { - s_graphicsoptions.colordepth.generic.flags &= ~QMF_GRAYED; - } - if ( s_graphicsoptions.allow_extensions.curvalue == 0 ) { if ( s_graphicsoptions.texturebits.curvalue == 0 ) @@ -604,10 +588,6 @@ static void GraphicsOptions_UpdateMenuItems( void ) { s_graphicsoptions.apply.generic.flags &= ~(QMF_HIDDEN|QMF_INACTIVE); } - if ( s_ivo.colordepth != s_graphicsoptions.colordepth.curvalue ) - { - s_graphicsoptions.apply.generic.flags &= ~(QMF_HIDDEN|QMF_INACTIVE); - } if ( s_ivo.driver != s_graphicsoptions.driver.curvalue ) { s_graphicsoptions.apply.generic.flags &= ~(QMF_HIDDEN|QMF_INACTIVE); @@ -753,7 +733,6 @@ static void GraphicsOptions_Event( void* ptr, int event ) { resToRatio[ s_graphicsoptions.mode.curvalue ]; s_graphicsoptions.tq.curvalue = ivo->tq; s_graphicsoptions.lighting.curvalue = ivo->lighting; - s_graphicsoptions.colordepth.curvalue = ivo->colordepth; s_graphicsoptions.texturebits.curvalue = ivo->texturebits; s_graphicsoptions.geometry.curvalue = ivo->geometry; s_graphicsoptions.filter.curvalue = ivo->filter; @@ -905,29 +884,6 @@ static void GraphicsOptions_SetMenuItems( void ) { s_graphicsoptions.geometry.curvalue = 2; } - - switch ( ( int ) trap_Cvar_VariableValue( "r_colorbits" ) ) - { - default: - case 0: - s_graphicsoptions.colordepth.curvalue = 0; - break; - case 16: - s_graphicsoptions.colordepth.curvalue = 1; - break; - case 32: - s_graphicsoptions.colordepth.curvalue = 2; - break; - } - - if ( s_graphicsoptions.fs.curvalue == 0 ) - { - s_graphicsoptions.colordepth.curvalue = 0; - } - if ( s_graphicsoptions.driver.curvalue == 1 ) - { - s_graphicsoptions.colordepth.curvalue = 1; - } } /* @@ -970,14 +926,6 @@ void GraphicsOptions_MenuInit( void ) NULL }; - static const char *colordepth_names[] = - { - "Default", - "16 bit", - "32 bit", - NULL - }; - static const char *filter_names[] = { "Bilinear", @@ -1125,15 +1073,6 @@ void GraphicsOptions_MenuInit( void ) s_graphicsoptions.mode.generic.id = ID_MODE; y += BIGCHAR_HEIGHT+2; - // references "r_colorbits" - s_graphicsoptions.colordepth.generic.type = MTYPE_SPINCONTROL; - s_graphicsoptions.colordepth.generic.name = "Color Depth:"; - s_graphicsoptions.colordepth.generic.flags = QMF_PULSEIFFOCUS|QMF_SMALLFONT; - s_graphicsoptions.colordepth.generic.x = 400; - s_graphicsoptions.colordepth.generic.y = y; - s_graphicsoptions.colordepth.itemnames = colordepth_names; - y += BIGCHAR_HEIGHT+2; - // references/modifies "r_fullscreen" s_graphicsoptions.fs.generic.type = MTYPE_SPINCONTROL; s_graphicsoptions.fs.generic.name = "Fullscreen:"; @@ -1236,7 +1175,6 @@ void GraphicsOptions_MenuInit( void ) Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.allow_extensions ); Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.ratio ); Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.mode ); - Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.colordepth ); Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.fs ); Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.lighting ); Menu_AddItem( &s_graphicsoptions.menu, ( void * ) &s_graphicsoptions.geometry );