summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/ui_main.c3
-rw-r--r--src/ui/ui_shared.c19
2 files changed, 7 insertions, 15 deletions
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c
index 8eaa77c..052ee23 100644
--- a/src/ui/ui_main.c
+++ b/src/ui/ui_main.c
@@ -5562,7 +5562,6 @@ UI_Init
*/
void _UI_Init( qboolean inGameLoad ) {
const char *menuSet;
- int start;
BG_InitClassOverrides( );
BG_InitAllowedGameElements( );
@@ -5648,8 +5647,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 6774742..f63a9fd 100644
--- a/src/ui/ui_shared.c
+++ b/src/ui/ui_shared.c
@@ -1549,12 +1549,9 @@ 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;
+ DC->feederCount(item->special);
if (item->window.flags & WINDOW_HORIZONTAL) {
// check if on left arrow
r.x = item->window.rect.x;
@@ -3644,11 +3641,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 +3672,8 @@ void Item_Slider_Paint(itemDef_t *item) {
}
void Item_Bind_Paint(itemDef_t *item) {
- vec4_t newColor, lowLight;
+ vec4_t newColor;
+ //vec4_t lowLight;
float value;
int maxChars = 0;
menuDef_t *parent = (menuDef_t*)item->parent;
@@ -3689,6 +3685,7 @@ 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;
@@ -3700,7 +3697,8 @@ void Item_Bind_Paint(itemDef_t *item) {
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));*/
+ LerpColor(parent->focusColor,lowLight,newColor,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));
+ */
//TA:
memcpy(newColor, &parent->focusColor, sizeof(vec4_t));
} else {
@@ -4099,12 +4097,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;