luanti-org/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-14 09:05:19 +02:00
Code Activity

Clamp player wieldindex when processing hotbar item selection (#13098)

Browse Source
This commit is contained in:
iliekprogrammar
2023-01-08 13:03:16 +00:00
committed by GitHub
parent 55804c56e9
commit fb28ca463e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/game.cpp
View File

@@ -2133,7 +2133,6 @@ void Game::processItemSelection(u16 *new_playeritem)
/* Item selection using mouse wheel /* Item selection using mouse wheel
*/ */
*new_playeritem = player->getWieldIndex(); *new_playeritem = player->getWieldIndex();
s32 wheel = input->getMouseWheel(); s32 wheel = input->getMouseWheel();
u16 max_item = MYMIN(PLAYER_INVENTORY_SIZE - 1, u16 max_item = MYMIN(PLAYER_INVENTORY_SIZE - 1,
player->hud_hotbar_itemcount - 1); player->hud_hotbar_itemcount - 1);
@@ -2160,6 +2159,9 @@ void Game::processItemSelection(u16 *new_playeritem)
break; break;
} }
} }
// Clamp selection again in case it wasn't changed but max_item was
*new_playeritem = MYMIN(*new_playeritem, max_item);
} }