summaryrefslogtreecommitdiff
path: root/src/ui
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui')
-rw-r--r--src/ui/ui_local.h8
-rw-r--r--src/ui/ui_main.c36
-rw-r--r--src/ui/ui_players.c81
-rw-r--r--src/ui/ui_shared.c87
4 files changed, 29 insertions, 183 deletions
diff --git a/src/ui/ui_local.h b/src/ui/ui_local.h
index 7afdf653..ad7d38b3 100644
--- a/src/ui/ui_local.h
+++ b/src/ui/ui_local.h
@@ -127,10 +127,8 @@ extern vmCvar_t ui_scoreShutoutBonus;
extern vmCvar_t ui_scoreTime;
extern vmCvar_t ui_smallFont;
extern vmCvar_t ui_bigFont;
-extern vmCvar_t ui_serverStatusTimeOut;
+extern vmCvar_t ui_serverStatusTimeOut;
-//TA: bank values
-extern vmCvar_t ui_bank;
//
@@ -746,7 +744,6 @@ typedef struct {
const char *modDescr;
} modInfo_t;
-//TA: tremulous menus
#define MAX_INFOPANE_TEXT 4096
#define MAX_INFOPANE_GRAPHICS 16
#define MAX_INFOPANES 128
@@ -785,7 +782,6 @@ typedef struct
const char *cmd;
tremInfoPane_t *infopane;
} tremMenuItem_t;
-//TA: tremulous menus
typedef struct {
displayContextDef_t uiDC;
@@ -855,7 +851,6 @@ typedef struct {
tremInfoPane_t tremInfoPanes[ MAX_INFOPANES ];
int tremInfoPaneCount;
-//TA: tremulous menus
tremMenuItem_t tremTeamList[ 4 ];
int tremTeamCount;
int tremTeamIndex;
@@ -887,7 +882,6 @@ typedef struct {
tremMenuItem_t tremHumanBuildList[ 32 ];
int tremHumanBuildCount;
int tremHumanBuildIndex;
-//TA: tremulous menus
serverStatus_t serverStatus;
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c
index 3ed44567..bdc2466c 100644
--- a/src/ui/ui_main.c
+++ b/src/ui/ui_main.c
@@ -290,7 +290,7 @@ int Text_Height(const char *text, float scale, int limit) {
float max;
glyphInfo_t *glyph;
float useScale;
- const char *s = text; // bk001206 - unsigned
+ const char *s = text;
fontInfo_t *font = &uiInfo.uiDC.Assets.textFont;
if (scale <= ui_smallFont.value) {
font = &uiInfo.uiDC.Assets.smallFont;
@@ -343,7 +343,7 @@ void Text_Paint(float x, float y, float scale, vec4_t color, const char *text, f
}
useScale = scale * font->glyphScale;
if (text) {
- const char *s = text; // bk001206 - unsigned
+ const char *s = text;
trap_R_SetColor( color );
memcpy(&newColor[0], &color[0], sizeof(vec4_t));
len = strlen(text);
@@ -469,7 +469,7 @@ void Text_PaintWithCursor(float x, float y, float scale, vec4_t color, const cha
}
useScale = scale * font->glyphScale;
if (text) {
- const char *s = text; // bk001206 - unsigned
+ const char *s = text;
trap_R_SetColor( color );
memcpy(&newColor[0], &color[0], sizeof(vec4_t));
len = strlen(text);
@@ -477,7 +477,7 @@ void Text_PaintWithCursor(float x, float y, float scale, vec4_t color, const cha
len = limit;
}
count = 0;
- glyph2 = &font->glyphs[ (int) cursor]; // bk001206 - possible signed char
+ glyph2 = &font->glyphs[ (int) cursor];
while (s && *s && count < len) {
glyph = &font->glyphs[(int)*s];
if ( Q_IsColorString( s ) ) {
@@ -616,7 +616,7 @@ static void Text_Paint_Limit(float *maxX, float x, float y, float scale, vec4_t
vec4_t newColor;
glyphInfo_t *glyph;
if (text) {
- const char *s = text; // bk001206 - unsigned
+ const char *s = text;
float max = *maxX;
float useScale;
fontInfo_t *font = &uiInfo.uiDC.Assets.textFont;
@@ -736,7 +736,7 @@ void _UI_Refresh( int realtime )
// draw cursor
UI_SetColor( NULL );
- //TA: don't draw the cursor whilst loading
+ // don't draw the cursor whilst loading
if( Menu_Count( ) > 0 && !trap_Cvar_VariableValue( "ui_loading" ) )
UI_DrawHandlePic( uiInfo.uiDC.cursorx-16, uiInfo.uiDC.cursory-16, 32, 32, uiInfo.uiDC.Assets.cursor);
@@ -2285,7 +2285,6 @@ static void UI_DrawServerMOTD(rectDef_t *rect, float scale, vec4_t color) {
}
static void UI_DrawKeyBindStatus(rectDef_t *rect, float scale, vec4_t color, int textStyle) {
-// int ofs = 0; TTimo: unused
if (Display_KeyBindPending()) {
Text_Paint(rect->x, rect->y, scale, color, "Waiting for new key... Press ESCAPE to cancel", 0, 0, textStyle);
} else {
@@ -2304,7 +2303,6 @@ static void UI_DrawGLInfo(rectDef_t *rect, float scale, vec4_t color, int textSt
Text_Paint(rect->x + 2, rect->y + 30, scale, color, va ("PIXELFORMAT: color(%d-bits) Z(%d-bits) stencil(%d-bits)", uiInfo.uiDC.glconfig.colorBits, uiInfo.uiDC.glconfig.depthBits, uiInfo.uiDC.glconfig.stencilBits), 0, 30, textStyle);
// build null terminated extension strings
- // TTimo: https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=399
// in TA this was not directly crashing, but displaying a nasty broken shader right in the middle
// brought down the string size to 1024, there's not much that can be shown on the screen anyway
Q_strncpyz(buff, uiInfo.uiDC.glconfig.extensions_string, 1024);
@@ -3999,8 +3997,6 @@ static void UI_RunMenuScript(char **args) {
} else if (Q_stricmp(name, "LoadMods") == 0) {
UI_LoadMods();
}
-
-//TA: tremulous menus
else if( Q_stricmp( name, "LoadTeams" ) == 0 )
UI_LoadTremTeams( );
else if( Q_stricmp( name, "JoinTeam" ) == 0 )
@@ -4084,8 +4080,6 @@ static void UI_RunMenuScript(char **args) {
trap_Cmd_ExecuteText( EXEC_APPEND, command );
}
}
-//TA: tremulous menus
-
else if (Q_stricmp(name, "playMovie") == 0) {
if (uiInfo.previewMovie >= 0) {
trap_CIN_StopCinematic(uiInfo.previewMovie);
@@ -4593,7 +4587,6 @@ UI_BuildServerDisplayList
static void UI_BuildServerDisplayList(qboolean force) {
int i, count, clients, maxClients, ping, game, len, visible;
char info[MAX_STRING_CHARS];
-// qboolean startRefresh = qtrue; TTimo: unused
static int numinvisible;
if (!(force || uiInfo.uiDC.realTime > uiInfo.serverStatus.nextDisplayRefresh)) {
@@ -5074,8 +5067,6 @@ static int UI_FeederCount(float feederID) {
} else if (feederID == FEEDER_DEMOS) {
return uiInfo.demoCount;
}
-
-//TA: tremulous menus
else if( feederID == FEEDER_TREMTEAMS )
return uiInfo.tremTeamCount;
else if( feederID == FEEDER_TREMHUMANITEMS )
@@ -5092,7 +5083,6 @@ static int UI_FeederCount(float feederID) {
return uiInfo.tremAlienBuildCount;
else if( feederID == FEEDER_TREMHUMANBUILD )
return uiInfo.tremHumanBuildCount;
-//TA: tremulous menus
return 0;
}
@@ -5273,8 +5263,6 @@ static const char *UI_FeederItemText(float feederID, int index, int column, qhan
return uiInfo.demoList[index];
}
}
-
-//TA: tremulous menus
else if( feederID == FEEDER_TREMTEAMS )
{
if( index >= 0 && index < uiInfo.tremTeamCount )
@@ -5315,7 +5303,6 @@ static const char *UI_FeederItemText(float feederID, int index, int column, qhan
if( index >= 0 && index < uiInfo.tremHumanBuildCount )
return uiInfo.tremHumanBuildList[ index ].text;
}
-//TA: tremulous menus
return "";
}
@@ -5432,8 +5419,6 @@ static void UI_FeederSelection(float feederID, int index) {
} else if (feederID == FEEDER_DEMOS) {
uiInfo.demoIndex = index;
}
-
-//TA: tremulous menus
else if( feederID == FEEDER_TREMTEAMS )
uiInfo.tremTeamIndex = index;
else if( feederID == FEEDER_TREMHUMANITEMS )
@@ -5450,7 +5435,6 @@ static void UI_FeederSelection(float feederID, int index) {
uiInfo.tremAlienBuildIndex = index;
else if( feederID == FEEDER_TREMHUMANBUILD )
uiInfo.tremHumanBuildIndex = index;
-//TA: tremulous menus
}
static void UI_Pause(qboolean b) {
@@ -6176,12 +6160,8 @@ vmCvar_t ui_realCaptureLimit;
vmCvar_t ui_realWarmUp;
vmCvar_t ui_serverStatusTimeOut;
-//TA: bank values
-vmCvar_t ui_bank;
vmCvar_t ui_winner;
-
-// bk001129 - made static to avoid aliasing
static cvarTable_t cvarTable[] = {
{ &ui_ffa_fraglimit, "ui_ffa_fraglimit", "20", CVAR_ARCHIVE },
{ &ui_ffa_timelimit, "ui_ffa_timelimit", "0", CVAR_ARCHIVE },
@@ -6305,12 +6285,8 @@ static cvarTable_t cvarTable[] = {
{ &ui_realWarmUp, "g_warmup", "20", CVAR_ARCHIVE},
{ &ui_realCaptureLimit, "capturelimit", "8", CVAR_SERVERINFO | CVAR_ARCHIVE | CVAR_NORESTART},
{ &ui_serverStatusTimeOut, "ui_serverStatusTimeOut", "7000", CVAR_ARCHIVE},
-
- { &ui_bank, "ui_bank", "0", 0 },
-
};
-// bk001129 - made static to avoid aliasing
static int cvarTableSize = sizeof(cvarTable) / sizeof(cvarTable[0]);
diff --git a/src/ui/ui_players.c b/src/ui/ui_players.c
index 5dbfdd3f..282fc74b 100644
--- a/src/ui/ui_players.c
+++ b/src/ui/ui_players.c
@@ -54,87 +54,6 @@ UI_PlayerInfo_SetWeapon
*/
static void UI_PlayerInfo_SetWeapon( playerInfo_t *pi, weapon_t weaponNum )
{
- //TA: FIXME: this is probably useless for trem
-/* gitem_t * item;
- char path[MAX_QPATH];
-
- pi->currentWeapon = weaponNum;
-tryagain:
- pi->realWeapon = weaponNum;
- pi->weaponModel = 0;
- pi->barrelModel = 0;
- pi->flashModel = 0;
-
- if ( weaponNum == WP_NONE ) {
- return;
- }
-
- if ( item->classname ) {
- pi->weaponModel = trap_R_RegisterModel( item->world_model[0] );
- }
-
- if( pi->weaponModel == 0 ) {
- if( weaponNum == WP_MACHINEGUN ) {
- weaponNum = WP_NONE;
- goto tryagain;
- }
- weaponNum = WP_MACHINEGUN;
- goto tryagain;
- }
-
- if ( weaponNum == WP_MACHINEGUN ) {
- strcpy( path, item->world_model[0] );
- COM_StripExtension( path, path );
- strcat( path, "_barrel.md3" );
- pi->barrelModel = trap_R_RegisterModel( path );
- }
-
- strcpy( path, item->world_model[0] );
- COM_StripExtension( path, path );
- strcat( path, "_flash.md3" );
- pi->flashModel = trap_R_RegisterModel( path );
-
- switch( weaponNum ) {
- case WP_GAUNTLET:
- MAKERGB( pi->flashDlightColor, 0.6f, 0.6f, 1 );
- break;
-
- case WP_MACHINEGUN:
- MAKERGB( pi->flashDlightColor, 1, 1, 0 );
- break;
-
- case WP_SHOTGUN:
- MAKERGB( pi->flashDlightColor, 1, 1, 0 );
- break;
-
- case WP_GRENADE_LAUNCHER:
- MAKERGB( pi->flashDlightColor, 1, 0.7f, 0.5f );
- break;
-
- case WP_ROCKET_LAUNCHER:
- MAKERGB( pi->flashDlightColor, 1, 0.75f, 0 );
- break;
-
- case WP_TESLAGEN:
- MAKERGB( pi->flashDlightColor, 0.6f, 0.6f, 1 );
- break;
-
- case WP_RAILGUN:
- MAKERGB( pi->flashDlightColor, 1, 0.5f, 0 );
- break;
-
- case WP_BFG:
- MAKERGB( pi->flashDlightColor, 1, 0.7f, 1 );
- break;
-
- case WP_GRAPPLING_HOOK:
- MAKERGB( pi->flashDlightColor, 0.6f, 0.6f, 1 );
- break;
-
- default:
- MAKERGB( pi->flashDlightColor, 1, 1, 1 );
- break;
- }*/
}
diff --git a/src/ui/ui_shared.c b/src/ui/ui_shared.c
index 2ca88cb6..0bb5b748 100644
--- a/src/ui/ui_shared.c
+++ b/src/ui/ui_shared.c
@@ -41,7 +41,7 @@ typedef struct scrollInfo_s {
static scrollInfo_t scrollInfo;
-//TA: hack to prevent compiler warnings
+// prevent compiler warnings
void voidFunction( void *var ) { return; }
qboolean voidFunction2( itemDef_t *var1, int var2 ) { return qfalse; }
@@ -83,7 +83,6 @@ static qboolean Menu_OverActiveItem(menuDef_t *menu, float x, float y);
#define MEM_POOL_SIZE 1024 * 1024
#endif
-//TA: hacked variable name to avoid conflict with new cgame Alloc
static char UI_memoryPool[MEM_POOL_SIZE];
static int allocPoint, outOfMemory;
@@ -542,7 +541,7 @@ qboolean PC_Script_Parse(int handle, const char **out) {
}
Q_strcat(script, 1024, " ");
}
- return qfalse; // bk001105 - LCC missing return value
+ return qfalse;
}
// display, window, menu, item code
@@ -1352,13 +1351,12 @@ qboolean Item_SetFocus(itemDef_t *item, float x, float y) {
itemDef_t *oldFocus;
sfxHandle_t *sfx = &DC->Assets.itemFocusSound;
qboolean playSound = qfalse;
- menuDef_t *parent; // bk001206: = (menuDef_t*)item->parent;
+ menuDef_t *parent;
// sanity check, non-null, not a decoration and does not already have the focus
if (item == NULL || item->window.flags & WINDOW_DECORATION || item->window.flags & WINDOW_HASFOCUS || !(item->window.flags & WINDOW_VISIBLE)) {
return qfalse;
}
- // bk001206 - this can be NULL.
parent = (menuDef_t*)item->parent;
// items can be enabled and disabled based on cvars
@@ -2406,7 +2404,6 @@ qboolean Item_HandleKey(itemDef_t *item, int key, qboolean down) {
captureFunc = voidFunction;
captureData = NULL;
} else {
- // bk001206 - parentheses
if ( down && ( key == K_MOUSE1 || key == K_MOUSE2 || key == K_MOUSE3 ) ) {
Item_StartCapture(item, key);
}
@@ -2661,7 +2658,6 @@ void Menu_HandleKey(menuDef_t *menu, int key, qboolean down) {
// see if the mouse is within the window bounds and if so is this a mouse click
if (down && !(menu->window.flags & WINDOW_POPUP) && !Rect_ContainsPoint(&menu->window.rect, DC->cursorx, DC->cursory)) {
static qboolean inHandleKey = qfalse;
- // bk001206 - parentheses
if (!inHandleKey && ( key == K_MOUSE1 || key == K_MOUSE2 || key == K_MOUSE3 ) ) {
inHandleKey = qtrue;
Menus_HandleOOBClick(menu, key, down);
@@ -2841,12 +2837,6 @@ void Item_TextColor(itemDef_t *item, vec4_t *newColor) {
Fade(&item->window.flags, &item->window.foreColor[3], parent->fadeClamp, &item->window.nextTime, parent->fadeCycle, qtrue, parent->fadeAmount);
if (item->window.flags & WINDOW_HASFOCUS) {
-/* lowLight[0] = 0.8 * parent->focusColor[0];
- lowLight[1] = 0.8 * parent->focusColor[1];
- lowLight[2] = 0.8 * parent->focusColor[2];
- lowLight[3] = 0.8 * 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 if (item->textStyle == ITEM_TEXTSTYLE_BLINK && !((DC->realTime/BLINK_DIVISOR) & 1)) {
lowLight[0] = 0.8 * item->window.foreColor[0];
@@ -2908,7 +2898,7 @@ int Item_Text_AutoWrapped_Lines( itemDef_t *item )
newLinePtr = p + 1;
}
- //TA: forceably split lines that are too long (where normal splitage has failed)
+ // forceably split lines that are too long (where normal splitage has failed)
if( textWidth > item->window.rect.w && newLine == 0 && *p != '\n' )
{
newLine = len;
@@ -3085,7 +3075,7 @@ void Item_Text_AutoWrapped_Paint( itemDef_t *item )
forwardColor = qtrue;
}
- //TA: forceably split lines that are too long (where normal splitage has failed)
+ // forceably split lines that are too long (where normal splitage has failed)
if( textWidth > item->window.rect.w && newLine == 0 && *p != '\n' )
{
newLine = len;
@@ -3299,12 +3289,6 @@ void Item_TextField_Paint(itemDef_t *item) {
parent = (menuDef_t*)item->parent;
if (item->window.flags & WINDOW_HASFOCUS) {
-/* lowLight[0] = 0.8 * parent->focusColor[0];
- lowLight[1] = 0.8 * parent->focusColor[1];
- lowLight[2] = 0.8 * parent->focusColor[2];
- lowLight[3] = 0.8 * 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));
@@ -3328,12 +3312,6 @@ void Item_YesNo_Paint(itemDef_t *item) {
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];
- lowLight[2] = 0.8 * parent->focusColor[2];
- lowLight[3] = 0.8 * 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));
@@ -3353,12 +3331,6 @@ void Item_Multi_Paint(itemDef_t *item) {
menuDef_t *parent = (menuDef_t*)item->parent;
if (item->window.flags & WINDOW_HASFOCUS) {
-/* lowLight[0] = 0.8 * parent->focusColor[0];
- lowLight[1] = 0.8 * parent->focusColor[1];
- lowLight[2] = 0.8 * parent->focusColor[2];
- lowLight[3] = 0.8 * 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));
@@ -3397,7 +3369,7 @@ static bind_t g_bindings[] =
{ "+scores", K_TAB, -1, -1, -1 },
{ "+button2", K_ENTER, -1, -1, -1 },
{ "+speed", K_SHIFT, -1, -1, -1 },
- { "boost", 'x', -1, -1, -1 }, //TA: human sprinting
+ { "boost", 'x', -1, -1, -1 }, // human sprinting
{ "+forward", K_UPARROW, -1, -1, -1 },
{ "+back", K_DOWNARROW, -1, -1, -1 },
{ "+moveleft", ',', -1, -1, -1 },
@@ -3426,12 +3398,12 @@ static bind_t g_bindings[] =
{ "weapon 12", -1, -1, -1, -1 },
{ "weapon 13", -1, -1, -1, -1 },
{ "+attack", K_MOUSE1, -1, -1, -1 },
- { "+button5", K_MOUSE2, -1, -1, -1 }, //TA: secondary attack
- { "reload", 'r', -1, -1, -1 }, //TA: reload
- { "buy ammo", 'b', -1, -1, -1 }, //TA: buy ammo
- { "itemact medkit", 'm', -1, -1, -1 }, //TA: use medkit
- { "+button7", 'q', -1, -1, -1 }, //TA: buildable use
- { "deconstruct", 'e', -1, -1, -1 }, //TA: buildable destroy
+ { "+button5", K_MOUSE2, -1, -1, -1 }, // secondary attack
+ { "reload", 'r', -1, -1, -1 }, // reload
+ { "buy ammo", 'b', -1, -1, -1 }, // buy ammo
+ { "itemact medkit", 'm', -1, -1, -1 }, // use medkit
+ { "+button7", 'q', -1, -1, -1 }, // buildable use
+ { "deconstruct", 'e', -1, -1, -1 }, // buildable destroy
{ "weapprev", '[', -1, -1, -1 },
{ "weapnext", ']', -1, -1, -1 },
{ "+button3", K_MOUSE3, -1, -1, -1 },
@@ -3442,7 +3414,6 @@ static bind_t g_bindings[] =
{ "teamvote no", K_F4, -1, -1, -1 },
{ "scoresUp", K_KP_PGUP, -1, -1, -1 },
{ "scoresDown", K_KP_PGDN, -1, -1, -1 },
- // bk001205 - this one below was: '-1'
{ "messagemode", -1, -1, -1, -1 },
{ "messagemode2", -1, -1, -1, -1 },
{ "messagemode3", -1, -1, -1, -1 },
@@ -3625,12 +3596,6 @@ void Item_Slider_Paint(itemDef_t *item) {
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];
- lowLight[2] = 0.8 * parent->focusColor[2];
- lowLight[3] = 0.8 * 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));
@@ -3675,8 +3640,7 @@ 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));*/
- //TA:
+
memcpy(newColor, &parent->focusColor, sizeof(vec4_t));
} else {
memcpy(&newColor, &item->window.foreColor, sizeof(vec4_t));
@@ -4015,7 +3979,6 @@ void Item_ListBox_Paint(itemDef_t *item) {
if (optionalImage >= 0) {
DC->drawHandlePic(x + 4 + listPtr->columnInfo[j].pos, y - 1 + listPtr->elementHeight / 2, listPtr->columnInfo[j].width, listPtr->columnInfo[j].width, optionalImage);
} else if (text) {
- //TA:
int alignOffset = 0.0f, tw;
tw = DC->textWidth( text, item->textscale, 0 );
@@ -4068,7 +4031,7 @@ void Item_ListBox_Paint(itemDef_t *item) {
}
}
- //TA: FIXME: hacky fix to off-by-one bug
+ // FIXME: hacky fix to off-by-one bug
listPtr->endPos--;
}
@@ -4099,12 +4062,6 @@ void Item_OwnerDraw_Paint(itemDef_t *item) {
}
if (item->window.flags & WINDOW_HASFOCUS) {
-/* lowLight[0] = 0.8 * parent->focusColor[0];
- lowLight[1] = 0.8 * parent->focusColor[1];
- lowLight[2] = 0.8 * parent->focusColor[2];
- lowLight[3] = 0.8 * parent->focusColor[3];
- LerpColor(parent->focusColor,lowLight,color,0.5+0.5*sin(DC->realTime / PULSE_DIVISOR));*/
- //TA:
memcpy(color, &parent->focusColor, sizeof(vec4_t));
} else if (item->textStyle == ITEM_TEXTSTYLE_BLINK && !((DC->realTime/BLINK_DIVISOR) & 1)) {
lowLight[0] = 0.8 * item->window.foreColor[0];
@@ -4115,7 +4072,7 @@ void Item_OwnerDraw_Paint(itemDef_t *item) {
}
if (item->cvarFlags & (CVAR_ENABLE | CVAR_DISABLE) && !Item_EnableShowViaCvar(item, CVAR_ENABLE)) {
- memcpy(color, parent->disableColor, sizeof(vec4_t)); // bk001207 - FIXME: Com_Memcpy
+ Com_Memcpy(color, parent->disableColor, sizeof(vec4_t));
}
if (item->text) {
@@ -4417,9 +4374,9 @@ menuDef_t *Menus_ActivateByName(const char *p) {
if (Q_stricmp(Menus[i].window.name, p) == 0) {
m = &Menus[i];
Menus_Activate(m);
- Menu_HandleMouseMove( m, DC->cursorx, DC->cursory ); //TA: force the item under the cursor to focus
+ Menu_HandleMouseMove( m, DC->cursorx, DC->cursory ); // force the item under the cursor to focus
- for( j = 0; j < m->itemCount; j++ ) //TA: reset selection in listboxes when opened
+ for( j = 0; j < m->itemCount; j++ ) // reset selection in listboxes when opened
{
if( m->items[ j ]->type == ITEM_TYPE_LISTBOX )
{
@@ -5256,7 +5213,7 @@ qboolean ItemParse_cvarStrList( itemDef_t *item, int handle ) {
}
}
- return qfalse; // bk001205 - LCC missing return value
+ return qfalse;
}
qboolean ItemParse_cvarFloatList( itemDef_t *item, int handle ) {
@@ -5301,7 +5258,7 @@ qboolean ItemParse_cvarFloatList( itemDef_t *item, int handle ) {
}
}
- return qfalse; // bk001205 - LCC missing return value
+ return qfalse;
}
@@ -5481,7 +5438,7 @@ qboolean Item_Parse(int handle, itemDef_t *item) {
return qfalse;
}
}
- return qfalse; // bk001205 - LCC missing return value
+ return qfalse;
}
@@ -5535,7 +5492,7 @@ qboolean MenuParse_name( itemDef_t *item, int handle ) {
qboolean MenuParse_fullscreen( itemDef_t *item, int handle ) {
menuDef_t *menu = (menuDef_t*)item;
- if (!PC_Int_Parse(handle, (int*) &menu->fullScreen)) { // bk001206 - cast qboolean
+ if (!PC_Int_Parse(handle, (int*) &menu->fullScreen)) {
return qfalse;
}
return qtrue;
@@ -5885,7 +5842,7 @@ qboolean Menu_Parse(int handle, menuDef_t *menu) {
return qfalse;
}
}
- return qfalse; // bk001205 - LCC missing return value
+ return qfalse;
}
/*
generated by cgit (git 2.34.1) at 2024-11-15 09:02:53 +0000