mirror of
https://github.com/ioquake/ioq3.git
synced 2025-05-30 08:31:14 +00:00
Bug 5094 - Code cleanup, patch by Zack Middleton and DevHC. Fixes unused-but-set gcc warnings
This commit is contained in:
Thilo Schulz
parent
1ea7ab1f42
commit
23f6fd1633
85 changed files with 246 additions and 496 deletions
|
|
@ -5018,7 +5018,6 @@ UI_Init
|
|||
*/
|
||||
void _UI_Init( qboolean inGameLoad ) {
|
||||
const char *menuSet;
|
||||
int start;
|
||||
|
||||
//uiInfo.inGameLoad = inGameLoad;
|
||||
|
||||
|
|
@ -5102,8 +5101,6 @@ void _UI_Init( qboolean inGameLoad ) {
|
|||
|
||||
AssetCache();
|
||||
|
||||
start = trap_Milliseconds();
|
||||
|
||||
uiInfo.teamCount = 0;
|
||||
uiInfo.characterCount = 0;
|
||||
uiInfo.aliasCount = 0;
|
||||
|
|
@ -5493,9 +5490,6 @@ void UI_DrawConnectScreen( qboolean overlay ) {
|
|||
yStart = 130;
|
||||
scale = 0.5f;
|
||||
} else {
|
||||
centerPoint = 320;
|
||||
yStart = 32;
|
||||
scale = 0.6f;
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -246,6 +246,7 @@ void String_Init(void) {
|
|||
}
|
||||
}
|
||||
|
||||
#if 0
|
||||
/*
|
||||
=================
|
||||
PC_SourceWarning
|
||||
|
|
@ -267,6 +268,7 @@ static __attribute__ ((format (printf, 2, 3))) void PC_SourceWarning(int handle,
|
|||
|
||||
Com_Printf(S_COLOR_YELLOW "WARNING: %s, line %d: %s\n", filename, line, string);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
=================
|
||||
|
|
@ -1528,12 +1530,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;
|
||||
|
|
@ -2592,16 +2590,9 @@ static rectDef_t *Item_CorrectedTextRect(itemDef_t *item) {
|
|||
void Menu_HandleKey(menuDef_t *menu, int key, qboolean down) {
|
||||
int i;
|
||||
itemDef_t *item = NULL;
|
||||
qboolean inHandler = qfalse;
|
||||
|
||||
if (inHandler) {
|
||||
return;
|
||||
}
|
||||
|
||||
inHandler = qtrue;
|
||||
if (g_waitingForKey && down) {
|
||||
Item_Bind_HandleKey(g_bindItem, key, down);
|
||||
inHandler = qfalse;
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -2609,7 +2600,6 @@ void Menu_HandleKey(menuDef_t *menu, int key, qboolean down) {
|
|||
if (!Item_TextField_HandleKey(g_editItem, key)) {
|
||||
g_editingField = qfalse;
|
||||
g_editItem = NULL;
|
||||
inHandler = qfalse;
|
||||
return;
|
||||
} else if (key == K_MOUSE1 || key == K_MOUSE2 || key == K_MOUSE3) {
|
||||
g_editingField = qfalse;
|
||||
|
|
@ -2621,18 +2611,16 @@ void Menu_HandleKey(menuDef_t *menu, int key, qboolean down) {
|
|||
}
|
||||
|
||||
if (menu == NULL) {
|
||||
inHandler = qfalse;
|
||||
return;
|
||||
}
|
||||
|
||||
// see if the mouse is within the window bounds and if so is this a mouse click
|
||||
// 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;
|
||||
if (!inHandleKey && ( key == K_MOUSE1 || key == K_MOUSE2 || key == K_MOUSE3 ) ) {
|
||||
inHandleKey = qtrue;
|
||||
Menus_HandleOOBClick(menu, key, down);
|
||||
inHandleKey = qfalse;
|
||||
inHandler = qfalse;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -2647,13 +2635,11 @@ void Menu_HandleKey(menuDef_t *menu, int key, qboolean down) {
|
|||
if (item != NULL) {
|
||||
if (Item_HandleKey(item, key, down)) {
|
||||
Item_Action(item);
|
||||
inHandler = qfalse;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (!down) {
|
||||
inHandler = qfalse;
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
@ -2744,7 +2730,6 @@ void Menu_HandleKey(menuDef_t *menu, int key, qboolean down) {
|
|||
}
|
||||
break;
|
||||
}
|
||||
inHandler = qfalse;
|
||||
}
|
||||
|
||||
void ToWindowCoords(float *x, float *y, windowDef_t *window) {
|
||||
|
|
@ -3036,8 +3021,6 @@ void Item_TextField_Paint(itemDef_t *item) {
|
|||
DC->getCVarString(item->cvar, buff, sizeof(buff));
|
||||
}
|
||||
|
||||
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];
|
||||
|
|
@ -3375,11 +3358,9 @@ void BindingFromName(const char *cvar) {
|
|||
|
||||
void Item_Slider_Paint(itemDef_t *item) {
|
||||
vec4_t newColor, lowLight;
|
||||
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];
|
||||
|
|
@ -3402,12 +3383,10 @@ void Item_Slider_Paint(itemDef_t *item) {
|
|||
|
||||
x = Item_Slider_ThumbPosition(item);
|
||||
DC->drawHandlePic( x - (SLIDER_THUMB_WIDTH / 2), y - 2, SLIDER_THUMB_WIDTH, SLIDER_THUMB_HEIGHT, DC->Assets.sliderThumb );
|
||||
|
||||
}
|
||||
|
||||
void Item_Bind_Paint(itemDef_t *item) {
|
||||
vec4_t newColor, lowLight;
|
||||
float value;
|
||||
int maxChars = 0;
|
||||
menuDef_t *parent = (menuDef_t*)item->parent;
|
||||
editFieldDef_t *editPtr = (editFieldDef_t*)item->typeData;
|
||||
|
|
@ -3415,8 +3394,6 @@ void Item_Bind_Paint(itemDef_t *item) {
|
|||
maxChars = editPtr->maxPaintChars;
|
||||
}
|
||||
|
||||
value = (item->cvar) ? DC->getCVarValue(item->cvar) : 0;
|
||||
|
||||
if (item->window.flags & WINDOW_HASFOCUS) {
|
||||
if (g_bindItem == item) {
|
||||
lowLight[0] = 0.8f * 1.0f;
|
||||
|
|
@ -3439,7 +3416,7 @@ void Item_Bind_Paint(itemDef_t *item) {
|
|||
BindingFromName(item->cvar);
|
||||
DC->drawText(item->textRect.x + item->textRect.w + 8, item->textRect.y, item->textscale, newColor, g_nameBind1, 0, maxChars, item->textStyle);
|
||||
} else {
|
||||
DC->drawText(item->textRect.x, item->textRect.y, item->textscale, newColor, (value != 0) ? "FIXME" : "FIXME", 0, maxChars, item->textStyle);
|
||||
DC->drawText(item->textRect.x, item->textRect.y, item->textscale, newColor, "FIXME", 0, maxChars, item->textStyle);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3644,7 +3621,8 @@ void Item_Image_Paint(itemDef_t *item) {
|
|||
}
|
||||
|
||||
void Item_ListBox_Paint(itemDef_t *item) {
|
||||
float x, y, size, count, i, thumb;
|
||||
float x, y, size, thumb;
|
||||
int count, i;
|
||||
qhandle_t image;
|
||||
qhandle_t optionalImage;
|
||||
listBoxDef_t *listPtr = (listBoxDef_t*)item->typeData;
|
||||
|
|
@ -3797,12 +3775,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;
|
||||
|
|
|
|||
|
|
@ -354,7 +354,7 @@ typedef struct {
|
|||
void (*getBindingBuf)( int keynum, char *buf, int buflen );
|
||||
void (*setBinding)( int keynum, const char *binding );
|
||||
void (*executeText)(int exec_when, const char *text );
|
||||
void (*Error)(int level, const char *error, ...) __attribute__ ((format (printf, 2, 3)));
|
||||
void (*Error)(int level, const char *error, ...) __attribute__ ((noreturn, format (printf, 2, 3)));
|
||||
void (*Print)(const char *msg, ...) __attribute__ ((format (printf, 1, 2)));
|
||||
void (*Pause)(qboolean b);
|
||||
int (*ownerDrawWidth)(int ownerDraw, float scale);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue