From 9e507d5c3fb7e50e60f71a36904a90d7f7fdd9e4 Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Sat, 19 Sep 2020 13:33:17 +0200 Subject: [PATCH] Handling for Library being passed to AngelscriptResolver being nullptr, for testing purposes. --- src/ScriptResolving/AngelScript/AngelScriptResolver.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ScriptResolving/AngelScript/AngelScriptResolver.cpp b/src/ScriptResolving/AngelScript/AngelScriptResolver.cpp index d48a807..7350cd1 100644 --- a/src/ScriptResolving/AngelScript/AngelScriptResolver.cpp +++ b/src/ScriptResolving/AngelScript/AngelScriptResolver.cpp @@ -84,8 +84,13 @@ void AngelScriptResolver::Initialize(CreatureLib::Battling::BattleLibrary* arg) RegisterTypes(); RegisterExceptionRoutines(_engine); - auto& staticLib = library->GetStaticLib(); - _engine->RegisterGlobalProperty("const StaticLibrary@ StaticLib", (void*)staticLib.get()); + if (library != nullptr){ + auto& staticLib = library->GetStaticLib(); + _engine->RegisterGlobalProperty("const StaticLibrary@ StaticLib", (void*)staticLib.get()); + } + else{ + _engine->RegisterGlobalProperty("const StaticLibrary@ StaticLib", nullptr); + } _contextPool = new ContextPool(_engine); }