mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-29 09:44:52 +01:00
Code Issues Releases Wiki Activity

Fix desync because of ride status (#10227)

Browse Source
This commit is contained in:
ζeh Matt
2019-11-16 16:12:33 +01:00
committed by Michael Steenbeek
parent f959be6b44
commit 5606b4895b
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -36,6 +36,7 @@
- Fix: [#10036] Do not allocate large chunks of memory for save file classification.
- Fix: [#10106] Ride circuits should not be used for modes that do not support it.
- Fix: [#10149] Desync in headless mode with rides that create smoke particles.
- Fix: [#10249] Desync because of ride crashes and simulation mode.
- Improved: [#9466] Add the rain weather effect to the OpenGL renderer.
- Improved: [#9987] Minimum load rounding.
- Improved: [#10125] Better support for high DPI screens.

2
src/openrct2/network/Network.cpp
View File

@@ -31,7 +31,7 @@
// This string specifies which version of network stream current build uses.
// It is used for making sure only compatible builds get connected, even within
// single OpenRCT2 version.
#define NETWORK_STREAM_VERSION "0"
#define NETWORK_STREAM_VERSION "1"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static Peep* _pickup_peep = nullptr;

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

@@ -17,6 +17,7 @@
#include "../OpenRCT2.h"
#include "../actions/RideEntranceExitRemoveAction.hpp"
#include "../actions/RideSetSetting.hpp"
#include "../actions/RideSetStatus.hpp"
#include "../actions/RideSetVehiclesAction.hpp"
#include "../actions/TrackRemoveAction.hpp"
#include "../audio/AudioMixer.h"
@@ -2100,7 +2101,9 @@ void Ride::Update()
// If ride is simulating but crashed, reset the vehicles
if (status == RIDE_STATUS_SIMULATING && (lifecycle_flags & RIDE_LIFECYCLE_CRASHED))
{
ride_set_status(this, RIDE_STATUS_SIMULATING);
// We require this to execute right away during the simulation, always ignore network and queue.
auto gameAction = RideSetStatusAction(id, RIDE_STATUS_SIMULATING);
GameActions::ExecuteNested(&gameAction);
}
}

13
src/openrct2/ride/Vehicle.cpp
View File

@@ -13,6 +13,7 @@
#include "../Editor.h"
#include "../Game.h"
#include "../OpenRCT2.h"
#include "../actions/RideSetStatus.hpp"
#include "../audio/AudioMixer.h"
#include "../audio/audio.h"
#include "../config/Config.h"
@@ -3528,7 +3529,9 @@ static void vehicle_update_collision_setup(rct_vehicle* vehicle)
if (ride->status != RIDE_STATUS_CLOSED)
{
ride_set_status(ride, RIDE_STATUS_CLOSED);
// We require this to execute right away during the simulation, always ignore network and queue.
auto gameAction = RideSetStatusAction(ride->id, RIDE_STATUS_CLOSED);
GameActions::ExecuteNested(&gameAction);
}
}
@@ -5260,7 +5263,9 @@ static void vehicle_crash_on_land(rct_vehicle* vehicle)
if (ride->status != RIDE_STATUS_CLOSED)
{
ride_set_status(ride, RIDE_STATUS_CLOSED);
// We require this to execute right away during the simulation, always ignore network and queue.
auto gameAction = RideSetStatusAction(ride->id, RIDE_STATUS_CLOSED);
GameActions::ExecuteNested(&gameAction);
}
}
ride->lifecycle_flags |= RIDE_LIFECYCLE_CRASHED;
@@ -5321,7 +5326,9 @@ static void vehicle_crash_on_water(rct_vehicle* vehicle)
if (ride->status != RIDE_STATUS_CLOSED)
{
ride_set_status(ride, RIDE_STATUS_CLOSED);
// We require this to execute right away during the simulation, always ignore network and queue.
auto gameAction = RideSetStatusAction(ride->id, RIDE_STATUS_CLOSED);
GameActions::ExecuteNested(&gameAction);
}
}
ride->lifecycle_flags |= RIDE_LIFECYCLE_CRASHED;