GitHub/amxmodx
2
0
Fork 0
mirror of https://github.com/alliedmodders/amxmodx.git synced 2024-12-25 06:15:37 +03:00
Code Issues Projects Releases Wiki Activity

Fixed the completely börked handling of the last page with newmenus.

Browse Source
This commit is contained in:
Steve Dudenhoeffer 2007-04-20 15:27:04 +00:00
parent 76158b031d
commit be4fdb1776
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
amxmodx/newmenus.cpp
View File

@ -199,26 +199,50 @@ int Menu::PagekeyToItem(page_t page, item_t key)
} }
} else if (page == num_pages - 1) { } else if (page == num_pages - 1) {
//last page //last page
item_t item_tracker = 0; // tracks how many valid items we have passed so far.
size_t remaining = m_Items.size() - start; size_t remaining = m_Items.size() - start;
/* We have to add one remaining for each "bumping" space */ item_t new_key = key;
// For every item that takes up a slot (item or padded blank)
// we subtract one from new key.
// For every item (not blanks), we increase item_tracker.
// When new_key equals 0, item_tracker will then be set to
// whatever valid item was selected.
for (size_t i=m_Items.size() - remaining; i<m_Items.size(); i++) for (size_t i=m_Items.size() - remaining; i<m_Items.size(); i++)
{ {
item_tracker++;
new_key--;
if (!new_key)
{
break;
}
for (size_t j=0; j<m_Items[i]->blanks.size(); j++) for (size_t j=0; j<m_Items[i]->blanks.size(); j++)
{ {
if (m_Items[i]->blanks[j] == 1) if (m_Items[i]->blanks[j] == 1)
{ {
remaining++; new_key--;
}
if (!new_key)
{
break;
} }
} }
} }
if (key == items_per_page + 1) // If new_key doesn't equal zero, then a back/exit button was pressed.
if (new_key!=0)
{ {
return MENU_BACK; if (key == items_per_page + 1)
} else if (key == items_per_page + 3) { {
return MENU_EXIT; return MENU_BACK;
} else { }
return (start + key - 1); else if (key == items_per_page + 3)
{
return MENU_EXIT;
}
// MENU_MORE should never happen here.
} }
// otherwise our item is now start + item_tracker - 1
return (start + item_tracker - 1);
} else { } else {
/* The algorithm for spaces here is a bit harder. We have to subtract /* The algorithm for spaces here is a bit harder. We have to subtract
* one from the key for each space we find along the way. * one from the key for each space we find along the way.