Newmenus: Fix unsigned underflow on "end" variable

This commit is contained in:
Valentin Grünbacher 2014-05-22 00:07:37 +02:00
parent ff18b03250
commit 50fbf29b3b

View File

@ -361,13 +361,13 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
{ {
if (start + items_per_page >= numItems) if (start + items_per_page >= numItems)
{ {
end = numItems - 1; end = numItems;
flags &= ~Display_Next; flags &= ~Display_Next;
} else { } else {
end = start + items_per_page - 1; end = start + items_per_page;
} }
} else { } else {
end = numItems - 1; end = numItems;
if (end > 10) if (end > 10)
{ {
end = 10; end = 10;
@ -388,7 +388,7 @@ const char *Menu::GetTextString(int player, page_t page, int &keys)
int slots = 0; int slots = 0;
int option_display = 0; int option_display = 0;
for (item_t i = start; i <= end; i++) for (item_t i = start; i < end; i++)
{ {
// reset enabled // reset enabled
enabled = true; enabled = true;