zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix "textsize.x may be used uninitialized".

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4940 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2015-01-25 12:15:37 +00:00
parent a50a332933
commit 3c8b06c688
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
polymer/eduke32/source/menus.c
View file

@ -3458,7 +3458,6 @@ static int32_t M_RunMenu_MenuMenu(Menu_t *cm, MenuMenu_t *menu, MenuEntry_t *cur
uint8_t status = 0; uint8_t status = 0;
int32_t height, x; int32_t height, x;
vec2_t textsize; vec2_t textsize;
int32_t dodraw = entry->type != Spacer;
if (entry == NULL) if (entry == NULL)
continue; continue;
@ -3472,7 +3471,7 @@ static int32_t M_RunMenu_MenuMenu(Menu_t *cm, MenuMenu_t *menu, MenuEntry_t *cur
if (entry->format->width == 0) if (entry->format->width == 0)
status |= MT_XCenter; status |= MT_XCenter;
dodraw &= 0 <= y - menu->scrollPos + entry->font->yline && y - menu->scrollPos <= klabs(menu->format->bottomcutoff) - menu->format->pos.y; const int32_t dodraw = entry->type != Spacer && 0 <= y - menu->scrollPos + entry->font->yline && y - menu->scrollPos <= klabs(menu->format->bottomcutoff) - menu->format->pos.y;
if (dodraw) if (dodraw)
textsize = M_MenuText(origin.x + x, origin.y + y_upper + y - menu->scrollPos, entry->font, entry->name, status, origin.y + y_upper, origin.y + y_lower); textsize = M_MenuText(origin.x + x, origin.y + y_upper + y - menu->scrollPos, entry->font, entry->name, status, origin.y + y_upper, origin.y + y_lower);
@ -4048,7 +4047,6 @@ static void M_RunMenu_MenuOptionList(Menu_t *cm, MenuEntry_t *entry, MenuOption_
uint8_t status = 0; uint8_t status = 0;
int32_t height, x; int32_t height, x;
vec2_t textsize; vec2_t textsize;
int32_t dodraw = 1;
x = object->options->menuFormat->pos.x; x = object->options->menuFormat->pos.x;
@ -4057,7 +4055,7 @@ static void M_RunMenu_MenuOptionList(Menu_t *cm, MenuEntry_t *entry, MenuOption_
if (object->options->entryFormat->width == 0) if (object->options->entryFormat->width == 0)
status |= MT_XCenter; status |= MT_XCenter;
dodraw &= 0 <= y - object->options->scrollPos + object->options->font->yline && y - object->options->scrollPos <= object->options->menuFormat->bottomcutoff - object->options->menuFormat->pos.y; const int32_t dodraw = 0 <= y - object->options->scrollPos + object->options->font->yline && y - object->options->scrollPos <= object->options->menuFormat->bottomcutoff - object->options->menuFormat->pos.y;
if (dodraw) if (dodraw)
textsize = M_MenuText(origin.x + x, origin.y + y_upper + y - object->options->scrollPos, object->options->font, object->options->optionNames[e], status, origin.y + y_upper, origin.y + y_lower); textsize = M_MenuText(origin.x + x, origin.y + y_upper + y - object->options->scrollPos, object->options->font, object->options->optionNames[e], status, origin.y + y_upper, origin.y + y_lower);