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

Merge pull request #17183 from Broxzier/bugfix/plug-in-crashes

This commit is contained in:
Hielke Morsink 2022-05-10 00:02:07 +02:00 committed by GitHub
parent 950ea807f6 a67e805e60
commit 8d5116419d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 754 additions and 416 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@ -12,6 +12,7 @@
- Fix: [#16934] Park size displayed incorrectly in Park window. - Fix: [#16934] Park size displayed incorrectly in Park window.
- Fix: [#16974] Small scenery ghosts can be deleted. - Fix: [#16974] Small scenery ghosts can be deleted.
- Fix: [#17005] Unable to set patrol area for first staff member in park. - Fix: [#17005] Unable to set patrol area for first staff member in park.
- Fix: [#17017] [Plugin] Crash when using tile element properties that require a valid ride to be linked.
- Fix: [#17073] Corrupt ride window and random crashes when trains have more than 144 cars. - Fix: [#17073] Corrupt ride window and random crashes when trains have more than 144 cars.
- Fix: [#17080] “Remove litter” cheat does not empty litter bins. - Fix: [#17080] “Remove litter” cheat does not empty litter bins.
- Fix: [#17099] Object selection thumbnail box is one pixel too tall. - Fix: [#17099] Object selection thumbnail box is one pixel too tall.

6
src/openrct2/scripting/ScriptEngine.cpp
View File

@ -915,6 +915,12 @@ DukValue ScriptEngine::ExecutePluginCall(
return DukValue(); return DukValue();
} }
void ScriptEngine::LogPluginInfo(std::string_view message)
{
auto plugin = _execInfo.GetCurrentPlugin();
LogPluginInfo(plugin, message);
}
void ScriptEngine::LogPluginInfo(const std::shared_ptr<Plugin>& plugin, std::string_view message) void ScriptEngine::LogPluginInfo(const std::shared_ptr<Plugin>& plugin, std::string_view message)
{ {
if (plugin == nullptr) if (plugin == nullptr)

3
src/openrct2/scripting/ScriptEngine.h
View File

@ -46,7 +46,7 @@ namespace OpenRCT2
namespace OpenRCT2::Scripting namespace OpenRCT2::Scripting
{ {
static constexpr int32_t OPENRCT2_PLUGIN_API_VERSION = 52; static constexpr int32_t OPENRCT2_PLUGIN_API_VERSION = 53;
// Versions marking breaking changes. // Versions marking breaking changes.
static constexpr int32_t API_VERSION_33_PEEP_DEPRECATION = 33; static constexpr int32_t API_VERSION_33_PEEP_DEPRECATION = 33;
@ -224,6 +224,7 @@ namespace OpenRCT2::Scripting
std::shared_ptr<Plugin> plugin, const DukValue& func, const DukValue& thisValue, const std::vector<DukValue>& args, std::shared_ptr<Plugin> plugin, const DukValue& func, const DukValue& thisValue, const std::vector<DukValue>& args,
bool isGameStateMutable); bool isGameStateMutable);
void LogPluginInfo(std::string_view message);
void LogPluginInfo(const std::shared_ptr<Plugin>& plugin, std::string_view message); void LogPluginInfo(const std::shared_ptr<Plugin>& plugin, std::string_view message);
void SubscribeToPluginStoppedEvent(std::function<void(std::shared_ptr<Plugin>)> callback) void SubscribeToPluginStoppedEvent(std::function<void(std::shared_ptr<Plugin>)> callback)

1160
src/openrct2/scripting/bindings/world/ScTileElement.cpp
View File

File diff suppressed because it is too large Load Diff