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

Fix #18839: New staff members now picked up correctly (#18956)

Browse Source 
* Fix #18839: New staff members now picked up correctly

When "Automatically place staff" is disabled, new staff members were not automatically placed into the "picked" state as is the case with vanilla RCT. This change ensures that new staff members are automatically placed into the picker and that, in scenarios where multiple new staff members are queued up without having first placed one, the most recently created staff member will be the actively picked up peep (also the case with vanilla).

* Fix #18839: Address networking issues

* Fix #18839: Add else to pickup action intent.
This commit is contained in:
mdbckrtn
2023-01-27 03:20:59 -05:00
committed by GitHub
parent 258b569deb
commit b1b056ec52
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/openrct2-ui/windows/StaffList.cpp
View File

@@ -15,6 +15,7 @@
#include <openrct2/Context.h>
#include <openrct2/Game.h>
#include <openrct2/Input.h>
#include <openrct2/actions/PeepPickupAction.h>
#include <openrct2/actions/StaffFireAction.h>
#include <openrct2/actions/StaffHireNewAction.h>
#include <openrct2/actions/StaffSetColourAction.h>
@@ -526,11 +527,38 @@ private:
return;
auto actionResult = res->GetData<StaffHireNewActionResult>();
// Open window for new staff.
auto* staff = GetEntity<Staff>(actionResult.StaffEntityId);
auto intent = Intent(WindowClass::Peep);
intent.PutExtra(INTENT_EXTRA_PEEP, staff);
ContextOpenIntent(&intent);
// If autoposition of staff is disabled, pickup peep and then open the staff window
if (staff->State == PeepState::Picked)
{
picked_peep_old_x = staff->x;
CoordsXYZ nullLoc{};
nullLoc.SetNull();
PeepPickupAction pickupAction{ PeepPickupType::Pickup, staff->sprite_index, nullLoc,
NetworkGetCurrentPlayerId() };
pickupAction.SetCallback([&staff](const GameAction* ga, const GameActions::Result* result) {
if (result->Error != GameActions::Status::Ok)
return;
auto intent = Intent(WindowClass::Peep);
intent.PutExtra(INTENT_EXTRA_PEEP, staff);
auto* wind = ContextOpenIntent(&intent);
if (wind != nullptr)
{
ToolSet(*wind, WC_STAFF__WIDX_PICKUP, Tool::Picker);
}
});
GameActions::Execute(&pickupAction);
}
else
{
// Open window for new staff.
auto intent = Intent(WindowClass::Peep);
intent.PutExtra(INTENT_EXTRA_PEEP, staff);
ContextOpenIntent(&intent);
}
});
GameActions::Execute(&hireStaffAction);

1
src/openrct2/actions/PeepPickupAction.cpp
View File

@@ -163,7 +163,6 @@ GameActions::Result PeepPickupAction::Execute() const
{
pickedUpPeep->PickupAbort(_loc.x);
}
NetworkSetPickupPeep(_owner, nullptr);
}
break;