mirror of
https://github.com/OpenRCT2/OpenRCT2
synced 2026-01-29 01:35:06 +01:00
Fix #7643: No Money scenarios can have funding set to zero
If research funding is set to no funding and scenario money is turned off, then update research at the normal rate.
This commit is contained in:
committed by
Michael Steenbeek
parent
9436dab66c
commit
ea371144e7
@@ -32,6 +32,7 @@
|
||||
#include "../ride/RideData.h"
|
||||
#include "../ride/RideGroupManager.h"
|
||||
#include "../ride/TrackData.h"
|
||||
#include "../world/Park.h"
|
||||
#include "../world/Scenery.h"
|
||||
#include "NewsItem.h"
|
||||
#include "Finance.h"
|
||||
@@ -342,7 +343,14 @@ void research_update()
|
||||
return;
|
||||
}
|
||||
|
||||
researchLevel = gResearchFundingLevel;
|
||||
if ((gParkFlags & PARK_FLAGS_NO_MONEY) && gResearchFundingLevel == RESEARCH_FUNDING_NONE)
|
||||
{
|
||||
researchLevel = RESEARCH_FUNDING_NORMAL;
|
||||
}
|
||||
else
|
||||
{
|
||||
researchLevel = gResearchFundingLevel;
|
||||
}
|
||||
|
||||
currentResearchProgress = gResearchProgress;
|
||||
currentResearchProgress += _researchRate[researchLevel];
|
||||
|
||||
@@ -34,7 +34,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 "2"
|
||||
#define NETWORK_STREAM_VERSION "3"
|
||||
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
|
||||
|
||||
static rct_peep* _pickup_peep = nullptr;
|
||||
|
||||
Reference in New Issue
Block a user