mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #13997: Placing track design influences clients ride construction

This commit is contained in:
Matt 2021-02-05 12:53:03 +02:00 committed by Ted John
parent b441cf768c
commit aea88b7320
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/openrct2/ride/TrackDesign.cpp
View File

@ -1623,7 +1623,7 @@ static GameActions::Result TrackDesignPlaceRide(TrackDesignState& tds, TrackDesi
}
auto trackPlaceAction = TrackPlaceAction(
_currentRideIndex, trackType, ride->type, { newCoords, tempZ, static_cast<uint8_t>(rotation) }, brakeSpeed,
ride->id, trackType, ride->type, { newCoords, tempZ, static_cast<uint8_t>(rotation) }, brakeSpeed,
trackColour, seatRotation, liftHillAndAlternativeState, true);
trackPlaceAction.SetFlags(flags);
@ -1843,6 +1843,8 @@ static GameActions::Result TrackDesignPlaceVirtual(
tds.PlaceScenery = false;
}
// NOTE: We need to save this, in networked games this would affect all clients otherwise.
auto savedRideId = _currentRideIndex;
_currentRideIndex = ride->id;
GameActions::Result trackPlaceRes;
@ -1854,6 +1856,7 @@ static GameActions::Result TrackDesignPlaceVirtual(
{
trackPlaceRes = TrackDesignPlaceRide(tds, td6, coords, ride);
}
_currentRideIndex = savedRideId;
if (trackPlaceRes.Error != GameActions::Status::Ok)
{