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 CI due to sign issue

Browse Source
This commit is contained in:
Ted John
2023-04-30 17:20:28 +01:00
parent 0ed4bfbc4a
commit 79f8913065
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/openrct2/object/ObjectTypes.h
View File

@@ -10,6 +10,7 @@
#pragma once
#include <array>
#include <cstddef>
#include <cstdint>
#include <limits>

18
src/openrct2/scripting/bindings/object/ScObjectManager.cpp
View File

@@ -7,12 +7,14 @@
* OpenRCT2 is licensed under the GNU General Public License version 3.
*****************************************************************************/
#include "ScObjectManager.h"
#ifdef ENABLE_SCRIPTING
#include "../../../object/ObjectList.h"
#include "../../../ride/RideData.h"
#include "../../Duktape.hpp"
#include "../../ScriptEngine.h"
# include "ScObjectManager.h"
# include "../../../object/ObjectList.h"
# include "../../../ride/RideData.h"
# include "../../Duktape.hpp"
# include "../../ScriptEngine.h"
using namespace OpenRCT2;
using namespace OpenRCT2::Scripting;
@@ -103,7 +105,7 @@ DukValue ScObjectManager::load(const DukValue& p1, const DukValue& p2)
if (p2.type() != DukValue::NUMBER)
throw DukException() << "Expected number for 'index'.";
auto index = p2.as_int();
auto index = static_cast<size_t>(p2.as_int());
auto limit = GetObjectTypeLimit(installedObject->Type);
if (index < limit)
{
@@ -112,7 +114,7 @@ DukValue ScObjectManager::load(const DukValue& p1, const DukValue& p2)
{
objectManager.UnloadObjects({ loadedObject->GetDescriptor() });
}
auto obj = objectManager.LoadObject(descriptor, index);
auto obj = objectManager.LoadObject(descriptor, static_cast<ObjectEntryIndex>(index));
if (obj != nullptr)
{
MarkAsResearched(obj);
@@ -277,3 +279,5 @@ DukValue ScObjectManager::CreateScObject(duk_context* ctx, ObjectType type, int3
return GetObjectAsDukValue(ctx, std::make_shared<ScObject>(type, index));
}
}
#endif