From 323364f0af7cb8e9660aa3c2fedd4b91d427ba5c Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Thu, 25 Jul 2024 07:25:27 +1000 Subject: [PATCH] well that doesn't compile outside MSVC apparently --- source/game/StarObject.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/game/StarObject.cpp b/source/game/StarObject.cpp index 753dafc..ece0b20 100644 --- a/source/game/StarObject.cpp +++ b/source/game/StarObject.cpp @@ -189,10 +189,10 @@ void Object::init(World* world, EntityId entityId, EntityMode mode) { setKeepAlive(configValue("keepAlive", false).toBool()); auto jScripts = configValue("scripts", JsonArray()); - StringList scripts = jScripts.isType(Json::Type::Array) - ? jsonToStringList(jScripts).transformed(bind(AssetPath::relativeTo, m_config->path, _1)) - : m_config->scripts; - m_scriptComponent.setScripts(scripts); + if (jScripts.isType(Json::Type::Array)) + m_scriptComponent.setScripts(jsonToStringList(jScripts).transformed(bind(AssetPath::relativeTo, m_config->path, _1))); + else + m_scriptComponent.setScripts(m_config->scripts); m_scriptComponent.setUpdateDelta(configValue("scriptDelta", 5).toInt()); m_scriptComponent.addCallbacks("object", makeObjectCallbacks());