diff --git a/conanfile.py b/conanfile.py index 44d0227bcd..ab0d6b409c 100644 --- a/conanfile.py +++ b/conanfile.py @@ -11,20 +11,20 @@ class RoR(ConanFile): def requirements(self): self.requires("angelscript/2.35.1") self.requires("discord-rpc/3.4.0@anotherfoxguy/stable") - self.requires("fmt/8.0.1") - self.requires("libcurl/7.79.1") + self.requires("libcurl/8.2.1") + self.requires("fmt/10.1.1") self.requires("mygui/3.4.0@anotherfoxguy/stable") self.requires("ogre3d-caelum/0.6.3.1@anotherfoxguy/stable") self.requires("ogre3d-pagedgeometry/1.2.0@anotherfoxguy/stable") self.requires("ogre3d/1.11.6.1@anotherfoxguy/stable", force=True) self.requires("ois/1.4.1@rigsofrods/custom") self.requires("openal-soft/1.22.2") - self.requires("openssl/1.1.1s", force=True) + self.requires("openssl/3.1.2", force=True) self.requires("rapidjson/cci.20211112", force=True) self.requires("socketw/3.11.0@anotherfoxguy/stable") self.requires("libpng/1.6.39", override=True) - self.requires("libwebp/1.3.0", override=True) + self.requires("libwebp/1.3.2", override=True) self.requires("zlib/1.2.13", override=True) def generate(self): diff --git a/source/main/scripting/ScriptEngine.cpp b/source/main/scripting/ScriptEngine.cpp index 01acfb1d6f..60100294e1 100644 --- a/source/main/scripting/ScriptEngine.cpp +++ b/source/main/scripting/ScriptEngine.cpp @@ -327,12 +327,12 @@ int ScriptEngine::executeContextAndHandleErrors(ScriptUnitId_t nid) if (context->GetFunction()) { SLOG(fmt::format("The script ended with error code asCONTEXT_NOT_PREPARED; Function to execute: {},currently triggered event: {}, NID: {}", - context->GetFunction()->GetName(), m_currently_executing_event_trigger, nid)); + context->GetFunction()->GetName(), fmt::underlying(m_currently_executing_event_trigger), nid)); } else { SLOG(fmt::format("The script ended with error code asCONTEXT_NOT_PREPARED; Function to execute NOT SET,currently triggered event: {}, NID: {}", - m_currently_executing_event_trigger, nid)); + fmt::underlying(m_currently_executing_event_trigger), nid)); } } else