mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-17 10:11:02 +00:00
Minor optimisations and clearer code.
This commit is contained in:
parent
8ab32ca93a
commit
7fe80a7f31
1 changed files with 5 additions and 5 deletions
10
src/m_menu.c
10
src/m_menu.c
|
@ -4812,7 +4812,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
|
|||
if (abs(i) > 128)
|
||||
{
|
||||
o = (lastdirection) ? -1 : 1;
|
||||
char_scroll = (itemOn+o)*128*FRACUNIT;
|
||||
char_scroll = (itemOn + o)*128*FRACUNIT;
|
||||
}
|
||||
|
||||
i = (itemOn*128 - char_scroll/FRACUNIT);
|
||||
|
@ -4849,7 +4849,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
|
|||
prev = (currentMenu->numitems - 1);
|
||||
} while (prev != i && PlayerMenu[prev].status == IT_DISABLED); // Skip over all disabled characters.
|
||||
|
||||
if (prev >= 0 && PlayerMenu[prev].status != IT_DISABLED
|
||||
if (prev != i
|
||||
&& o < 32)
|
||||
{
|
||||
picname = description[prev].picname;
|
||||
|
@ -4883,7 +4883,7 @@ static void M_DrawSetupChoosePlayerMenu(void)
|
|||
next = 0;
|
||||
} while (next != i && PlayerMenu[next].status == IT_DISABLED); // Skip over all disabled characters.
|
||||
|
||||
if (next < currentMenu->numitems && PlayerMenu[next].status != IT_DISABLED
|
||||
if (next != i
|
||||
&& o < 128)
|
||||
{
|
||||
picname = description[next].picname;
|
||||
|
@ -4910,9 +4910,9 @@ static void M_DrawSetupChoosePlayerMenu(void)
|
|||
|
||||
// current character
|
||||
if (PlayerMenu[i].status == IT_DISABLED) // Prevent flickering.
|
||||
i = (lastdirection) ? prev : next;
|
||||
i = (lastdirection) ? prev : next; // This actually causes duplication at slow scroll speeds (<16FU per tic), but thankfully we always go quickly.
|
||||
|
||||
if (i < currentMenu->numitems && PlayerMenu[i].status != IT_DISABLED)
|
||||
if (PlayerMenu[i].status != IT_DISABLED)
|
||||
{
|
||||
picname = description[i].picname;
|
||||
if (picname[0] == '\0')
|
||||
|
|
Loading…
Reference in a new issue