From 6620da957426fbc776a1bb2da9771ddb8d668a7e Mon Sep 17 00:00:00 2001 From: necavi Date: Sat, 23 May 2015 15:55:47 -0700 Subject: [PATCH] Fixed paginated menus in CS:GO CS:GO does not have the "slot0" command bound, meaning that the close button would not work. --- .../packages/source-python/menus/radio.py | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/addons/source-python/packages/source-python/menus/radio.py b/addons/source-python/packages/source-python/menus/radio.py index be94834ec..3779aa914 100644 --- a/addons/source-python/packages/source-python/menus/radio.py +++ b/addons/source-python/packages/source-python/menus/radio.py @@ -15,6 +15,8 @@ from menus.queue import _radio_queues # Messages from messages import ShowMenu +# Core +from core import SOURCE_ENGINE_BRANCH # ============================================================================= @@ -184,7 +186,7 @@ def __init__( def _get_max_item_count(self): """Return the maximum possible item count per page.""" - return 7 + return 6 if SOURCE_ENGINE_BRANCH == "csgo" else 7 def _format_header(self, player_index, page, slots): """Prepare the header for the menu. @@ -271,20 +273,23 @@ def _format_footer(self, player_index, page, slots): # Add "Back" option back_selectable = page.index > 0 buffer += PagedRadioOption( - 'Back', highlight=back_selectable)._render(player_index, 8) + 'Back', highlight=back_selectable)._render(player_index, self._get_max_item_count() + 1) if back_selectable: - slots.add(8) + slots.add(self._get_max_item_count() + 1) # Add "Next" option next_selectable = page.index < self.last_page_index buffer += PagedRadioOption( - 'Next', highlight=next_selectable)._render(player_index, 9) + 'Next', highlight=next_selectable)._render(player_index, self._get_max_item_count() + 2) if next_selectable: - slots.add(9) + slots.add(self._get_max_item_count() + 2) # Add "Close" option + slot = (self._get_max_item_count() + 3) % 10 buffer += PagedRadioOption( - 'Close', highlight=False)._render(player_index, 0) + 'Close', highlight=True)._render(player_index, slot) + if slot > 0: + slots.add(slot) # Return the buffer return buffer @@ -323,7 +328,7 @@ def _select(self, player_index, choice_index): A numeric value that defines what was selected. """ # Do nothing if the menu is being closed - if choice_index == 0: + if choice_index == (self._get_max_item_count() + 3) % 10: del self._player_pages[player_index] return None @@ -331,12 +336,12 @@ def _select(self, player_index, choice_index): page = self._player_pages[player_index] # Display previous page? - if choice_index == 8: + if choice_index == self._get_max_item_count() + 1: self.set_player_page(player_index, page.index - 1) return self # Display next page? - if choice_index == 9: + if choice_index == self._get_max_item_count() + 2: self.set_player_page(player_index, page.index + 1) return self