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

Merge pull request #15231 from ZehMatt/fix-15169

Browse Source 
Refactor out capturing of window pointers with GA callbacks
This commit is contained in:
ζeh Matt
2021-08-21 06:07:35 -07:00
committed by GitHub
parent 15d3a4a9da 8d801d9126
commit 8de2965f13
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,7 @@
#include <openrct2/network/network.h>
#include <openrct2/sprites.h>
#include <openrct2/util/Util.h>
#include <utility>
// clang-format off
enum WINDOW_PLAYER_PAGE {
@@ -265,8 +266,9 @@ void window_player_overview_mouse_down(rct_window* w, rct_widgetindex widgetInde
void window_player_overview_dropdown(rct_window* w, rct_widgetindex widgetIndex, int32_t dropdownIndex)
{
int32_t player = network_get_player_index(static_cast<uint8_t>(w->number));
if (player == -1)
const auto playerId = static_cast<uint8_t>(w->number);
const auto playerIdx = network_get_player_index(playerId);
if (playerIdx == -1)
{
return;
}
@@ -274,12 +276,13 @@ void window_player_overview_dropdown(rct_window* w, rct_widgetindex widgetIndex,
{
return;
}
int32_t group = network_get_group_id(dropdownIndex);
auto playerSetGroupAction = PlayerSetGroupAction(w->number, group);
playerSetGroupAction.SetCallback([=](const GameAction* ga, const GameActions::Result* result) {
const auto groupId = network_get_group_id(dropdownIndex);
const auto windowHandle = std::make_pair(w->classification, w->number);
auto playerSetGroupAction = PlayerSetGroupAction(playerId, groupId);
playerSetGroupAction.SetCallback([windowHandle](const GameAction* ga, const GameActions::Result* result) {
if (result->Error == GameActions::Status::Ok)
{
w->Invalidate();
window_invalidate_by_number(windowHandle.first, windowHandle.second);
}
});
GameActions::Execute(&playerSetGroupAction);

3
src/openrct2-ui/windows/RideConstruction.cpp
View File

@@ -1933,6 +1933,7 @@ static void window_ride_construction_mouseup_demolish(rct_window* w)
_currentTrackPieceType, 0,
{ _currentTrackBegin.x, _currentTrackBegin.y, _currentTrackBegin.z, _currentTrackPieceDirection });
const auto rideId = w->number;
trackRemoveAction.SetCallback([=](const GameAction* ga, const GameActions::Result* result) {
if (result->Error != GameActions::Status::Ok)
{
@@ -1940,7 +1941,7 @@ static void window_ride_construction_mouseup_demolish(rct_window* w)
}
else
{
auto ride = get_ride(w->number);
auto ride = get_ride(rideId);
if (ride != nullptr)
{
_stationConstructed = ride->num_stations != 0;