mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Merge pull request #8871 from ZehMatt/fix-8870

Browse Source 
Fix #8870: Use player index instead of id.
This commit is contained in:
ζeh Matt
2019-03-15 19:18:13 -07:00
committed by GitHub
parent b7edca8ef3 9249b0c887
commit e63392bc08
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2-ui/windows/Player.cpp
View File

@@ -400,6 +400,12 @@ void window_player_overview_paint(rct_window* w, rct_drawpixelinfo* dpi)
void window_player_overview_invalidate(rct_window* w)
{
int32_t playerIndex = network_get_player_index((uint8_t)w->number);
if (playerIndex == -1)
{
return;
}
if (window_player_page_widgets[w->page] != w->widgets)
{
w->widgets = window_player_page_widgets[w->page];
@@ -449,7 +455,7 @@ void window_player_overview_invalidate(rct_window* w)
// Only enable kick button for other players
const bool canKick = network_can_perform_action(network_get_current_player_group_index(), NETWORK_PERMISSION_KICK_PLAYER);
const bool isServer = network_get_player_flags(w->number) & NETWORK_PLAYER_FLAG_ISSERVER;
const bool isServer = network_get_player_flags(playerIndex) & NETWORK_PLAYER_FLAG_ISSERVER;
const bool isOwnWindow = (network_get_current_player_id() == w->number);
widget_set_enabled(w, WIDX_KICK, canKick && !isOwnWindow && !isServer);
}