From b2b602040de53f1f4e1905e507e0aa740928f3e9 Mon Sep 17 00:00:00 2001 From: Paweł Redman Date: Sun, 29 Mar 2020 11:46:57 +0200 Subject: Fix compiler warnings Mostly a metric ton of unused variables --- src/ui/ui_main.c | 3 --- src/ui/ui_shared.c | 26 ++------------------------ 2 files changed, 2 insertions(+), 27 deletions(-) (limited to 'src/ui') diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index e2396a9..d74dd9d 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -5523,7 +5523,6 @@ UI_Init */ void _UI_Init( qboolean inGameLoad ) { const char *menuSet; - int start; BG_InitClassOverrides( ); BG_InitAllowedGameElements( ); @@ -5609,8 +5608,6 @@ void _UI_Init( qboolean inGameLoad ) { AssetCache(); - start = trap_Milliseconds(); - uiInfo.teamCount = 0; uiInfo.characterCount = 0; uiInfo.aliasCount = 0; diff --git a/src/ui/ui_shared.c b/src/ui/ui_shared.c index 5640e0e..c5991b7 100644 --- a/src/ui/ui_shared.c +++ b/src/ui/ui_shared.c @@ -1549,12 +1549,8 @@ int Item_Slider_OverSlider(itemDef_t *item, float x, float y) { int Item_ListBox_OverLB(itemDef_t *item, float x, float y) { rectDef_t r; - listBoxDef_t *listPtr; int thumbstart; - int count; - count = DC->feederCount(item->special); - listPtr = (listBoxDef_t*)item->typeData; if (item->window.flags & WINDOW_HORIZONTAL) { // check if on left arrow r.x = item->window.rect.x; @@ -3644,11 +3640,9 @@ void BindingFromName(const char *cvar) { void Item_Slider_Paint(itemDef_t *item) { vec4_t newColor; - float x, y, value; + float x, y; menuDef_t *parent = (menuDef_t*)item->parent; - value = (item->cvar) ? DC->getCVarValue(item->cvar) : 0; - if (item->window.flags & WINDOW_HASFOCUS) { /* lowLight[0] = 0.8 * parent->focusColor[0]; lowLight[1] = 0.8 * parent->focusColor[1]; @@ -3677,7 +3671,7 @@ void Item_Slider_Paint(itemDef_t *item) { } void Item_Bind_Paint(itemDef_t *item) { - vec4_t newColor, lowLight; + vec4_t newColor; float value; int maxChars = 0; menuDef_t *parent = (menuDef_t*)item->parent; @@ -3689,19 +3683,6 @@ void Item_Bind_Paint(itemDef_t *item) { value = (item->cvar) ? DC->getCVarValue(item->cvar) : 0; if (item->window.flags & WINDOW_HASFOCUS) { - if (g_bindItem == item) { - lowLight[0] = 0.8f * 1.0f; - lowLight[1] = 0.8f * 0.0f; - lowLight[2] = 0.8f * 0.0f; - lowLight[3] = 0.8f * 1.0f; - } else { - lowLight[0] = 0.8f * parent->focusColor[0]; - lowLight[1] = 0.8f * parent->focusColor[1]; - lowLight[2] = 0.8f * parent->focusColor[2]; - lowLight[3] = 0.8f * parent->focusColor[3]; - } - /*LerpColor(parent->focusColor,lowLight,newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));*/ - //TA: memcpy(newColor, &parent->focusColor, sizeof(vec4_t)); } else { memcpy(&newColor, &item->window.foreColor, sizeof(vec4_t)); @@ -4099,12 +4080,9 @@ void Item_ListBox_Paint(itemDef_t *item) { void Item_OwnerDraw_Paint(itemDef_t *item) { - menuDef_t *parent; - if (item == NULL) { return; } - parent = (menuDef_t*)item->parent; if (DC->ownerDrawItem) { vec4_t color, lowLight; -- cgit