diff --git a/include/TLuaEngine.h b/include/TLuaEngine.h index 14e4ca9..b44e834 100644 --- a/include/TLuaEngine.h +++ b/include/TLuaEngine.h @@ -19,6 +19,9 @@ #include #define SOL_ALL_SAFETIES_ON 1 +#define SOL_USER_C_ASSERT SOL_ON +#define SOL_C_ASSERT(...) \ + beammp_lua_errorf("SOL2 assertion failure: Assertion `{}` failed in {}:{}. This *should* be a fatal error, but BeamMP Server overrides it to not be fatal. This may cause the Lua Engine to crash, or cause other issues.", #__VA_ARGS__, __FILE__, __LINE__) #include struct JsonString { diff --git a/src/main.cpp b/src/main.cpp index 69788c8..da996bf 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -91,7 +91,7 @@ int BeamMPServerMain(MainArguments Arguments) { Application::Console().WriteRaw(fmt::format("BeamMP Server v{} ({})", Application::ServerVersionString(), BEAMMP_GIT_HASH)); return 0; } - + std::string ConfigPath = "ServerConfig.toml"; if (Parser.FoundArgument({ "config" })) { auto MaybeConfigPath = Parser.GetValueOfArgument({ "config" });