mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-22 10:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix #14225: Desync when “allow early scenario completion” is enabled

Browse source
This commit is contained in:
Michael Steenbeek 2021-03-08 20:16:21 +01:00 committed by GitHub
parent b1a54fa7ba
commit bc2df33b0a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
distribution/changelog.txt
View file

@ -60,6 +60,7 @@
- Fix: [#13961] Animation for Guests sliding down Spiral Slide is missing on close zoom levels.
- Fix: [#14012] 'Finish 5 roller coasters' goal is listed incorrectly in scenario selector.
- Fix: [#14095] Holding down [-][+] buttons does not decrease/increase number of circuits.
- Fix: [#14225] Desync when “allow early scenario completion” is enabled.
- Fix: [#14247] Scenarios from RCT1 allow hiring too many staff.
- Improved: [#6022] Allow up to 128 ride objects to be selected in track designer.
- Improved: [#12917] Changed peep movement so that they stay more spread out over the full width of single tile paths.

9
src/openrct2/scenario/Scenario.cpp
View file

@ -288,6 +288,7 @@ static void scenario_day_update()
{
finance_update_daily_profit();
peep_update_days_in_queue();
bool allowEarlyCompletion = gConfigGeneral.allow_early_completion && (network_get_mode() == NETWORK_MODE_NONE);
switch (gScenarioObjective.Type)
{
case OBJECTIVE_10_ROLLERCOASTERS:
@ -298,7 +299,7 @@ static void scenario_day_update()
scenario_objective_check();
break;
default:
if (gConfigGeneral.allow_early_completion)
if (allowEarlyCompletion)
scenario_objective_check();
break;
}
@ -712,8 +713,9 @@ ObjectiveStatus Objective::CheckGuestsBy() const
{
int16_t parkRating = gParkRating;
int32_t currentMonthYear = gDateMonthsElapsed;
bool allowEarlyCompletion = gConfigGeneral.allow_early_completion && (network_get_mode() == NETWORK_MODE_NONE);
if (currentMonthYear == MONTH_COUNT * Year || gConfigGeneral.allow_early_completion)
if (currentMonthYear == MONTH_COUNT * Year || allowEarlyCompletion)
{
if (parkRating >= 600 && gNumGuestsInPark >= NumGuests)
{
@ -733,8 +735,9 @@ ObjectiveStatus Objective::CheckParkValueBy() const
int32_t currentMonthYear = gDateMonthsElapsed;
money32 objectiveParkValue = Currency;
money32 parkValue = gParkValue;
bool allowEarlyCompletion = gConfigGeneral.allow_early_completion && (network_get_mode() == NETWORK_MODE_NONE);
if (currentMonthYear == MONTH_COUNT * Year || gConfigGeneral.allow_early_completion)
if (currentMonthYear == MONTH_COUNT * Year || allowEarlyCompletion)
{
if (parkValue >= objectiveParkValue)
{