mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-06 06:32:56 +01:00
Code Issues Releases Wiki Activity

Fix #17844L ‘ride.ratings.calculate’ hook called several times during calculation

Browse Source 
The ‘ride.ratings.calculate’ API hook is now called for a ride only after its rating calculations are complete (RIDE_LIFECYCLE_TESTED lifecycle_flag is set).
This commit is contained in:
Dan Stevens
2022-08-20 23:25:17 +01:00
committed by GitHub
parent 564a902b5f
commit 4291568a95
3 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contributors.md
View File

@@ -195,6 +195,7 @@ The following people are not part of the development team, but have been contrib
* Hoby R. (hobyr)
* Huu Kim Nguyen (CoderUndefined)
* Henry Cheng (jazzysoggy)
* Dan Stevens (MajeureX)
## Toolchain
* (Balletie) - macOS

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

@@ -42,7 +42,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 "6"
#define NETWORK_STREAM_VERSION "7"
#define NETWORK_STREAM_ID OPENRCT2_VERSION "-" NETWORK_STREAM_VERSION
static Peep* _pickup_peep = nullptr;

46
src/openrct2/ride/RideRatings.cpp
View File

@@ -739,32 +739,36 @@ static void ride_ratings_calculate(RideRatingUpdateState& state, Ride* ride)
#endif
#ifdef ENABLE_SCRIPTING
auto& hookEngine = GetContext()->GetScriptEngine().GetHookEngine();
if (hookEngine.HasSubscriptions(HOOK_TYPE::RIDE_RATINGS_CALCULATE))
// Only call the 'ride.ratings.calculate' API hook if testing of the ride is complete
if (ride->lifecycle_flags & RIDE_LIFECYCLE_TESTED)
{
auto ctx = GetContext()->GetScriptEngine().GetContext();
auto originalExcitement = ride->excitement;
auto originalIntensity = ride->intensity;
auto originalNausea = ride->nausea;
auto& hookEngine = GetContext()->GetScriptEngine().GetHookEngine();
if (hookEngine.HasSubscriptions(HOOK_TYPE::RIDE_RATINGS_CALCULATE))
{
auto ctx = GetContext()->GetScriptEngine().GetContext();
auto originalExcitement = ride->excitement;
auto originalIntensity = ride->intensity;
auto originalNausea = ride->nausea;
// Create event args object
auto obj = DukObject(ctx);
obj.Set("rideId", ride->id.ToUnderlying());
obj.Set("excitement", originalExcitement);
obj.Set("intensity", originalIntensity);
obj.Set("nausea", originalNausea);
// Create event args object
auto obj = DukObject(ctx);
obj.Set("rideId", ride->id.ToUnderlying());
obj.Set("excitement", originalExcitement);
obj.Set("intensity", originalIntensity);
obj.Set("nausea", originalNausea);
// Call the subscriptions
auto e = obj.Take();
hookEngine.Call(HOOK_TYPE::RIDE_RATINGS_CALCULATE, e, true);
// Call the subscriptions
auto e = obj.Take();
hookEngine.Call(HOOK_TYPE::RIDE_RATINGS_CALCULATE, e, true);
auto scriptExcitement = AsOrDefault(e["excitement"], static_cast<int32_t>(originalExcitement));
auto scriptIntensity = AsOrDefault(e["intensity"], static_cast<int32_t>(originalIntensity));
auto scriptNausea = AsOrDefault(e["nausea"], static_cast<int32_t>(originalNausea));
auto scriptExcitement = AsOrDefault(e["excitement"], static_cast<int32_t>(originalExcitement));
auto scriptIntensity = AsOrDefault(e["intensity"], static_cast<int32_t>(originalIntensity));
auto scriptNausea = AsOrDefault(e["nausea"], static_cast<int32_t>(originalNausea));
ride->excitement = std::clamp<int32_t>(scriptExcitement, 0, INT16_MAX);
ride->intensity = std::clamp<int32_t>(scriptIntensity, 0, INT16_MAX);
ride->nausea = std::clamp<int32_t>(scriptNausea, 0, INT16_MAX);
ride->excitement = std::clamp<int32_t>(scriptExcitement, 0, INT16_MAX);
ride->intensity = std::clamp<int32_t>(scriptIntensity, 0, INT16_MAX);
ride->nausea = std::clamp<int32_t>(scriptNausea, 0, INT16_MAX);
}
}
#endif
}