diasurgical/DevilutionX
1
0
Fork 0
mirror of https://github.com/diasurgical/DevilutionX.git synced 2026-06-20 05:44:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Require lua/init.lua to succeed

Browse Source 
Previously we failed silently if something went wrong.
This commit is contained in:
Gleb Mazovetskiy
2023-11-01 20:57:34 +00:00
parent 44f3560709
commit 165f95e38f
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/lua/lua.cpp
+23 -14
View File
@@ -5,6 +5,7 @@
#include <sol/sol.hpp>
#include "appfat.h"
#include "engine/assets.hpp"
#include "lua/modules/log.hpp"
#include "lua/modules/render.hpp"
@@ -33,37 +34,45 @@ int LuaPrint(lua_State *state)
return 0;
}
bool CheckResult(sol::protected_function_result result)
bool CheckResult(sol::protected_function_result result, bool optional)
{
const bool valid = result.valid();
if (!valid) {
if (result.get_type() == sol::type::string) {
LogError("Lua error: {}", result.get<std::string>());
} else {
LogError("Unknown Lua error");
}
const std::string error = result.get_type() == sol::type::string
? StrCat("Lua error: ", result.get<std::string>())
: "Unknown Lua error";
if (!optional)
app_fatal(error);
LogError(error);
}
return valid;
}
void RunScript(std::string_view path)
void RunScript(std::string_view path, bool optional)
{
AssetRef ref = FindAsset(path);
if (!ref.ok())
if (!ref.ok()) {
if (!optional)
app_fatal(StrCat("Asset not found: ", path));
return;
}
const size_t size = ref.size();
std::unique_ptr<char[]> luaScript { new char[size] };
AssetHandle handle = OpenAsset(std::move(ref));
if (!handle.ok())
if (!handle.ok()) {
app_fatal(StrCat("Failed to open asset: ", path, "\n", handle.error()));
return;
}
if (size > 0 && !handle.read(luaScript.get(), size))
if (size > 0 && !handle.read(luaScript.get(), size)) {
app_fatal(StrCat("Read failed: ", path, "\n", handle.error()));
return;
}
const std::string_view luaScriptStr(luaScript.get(), size);
CheckResult(luaState->safe_script(luaScriptStr));
CheckResult(luaState->safe_script(luaScriptStr), optional);
}
void LuaPanic(sol::optional<std::string> message)
@@ -113,8 +122,8 @@ void LuaInitialize()
"render", LuaRenderModule(lua),
"message", [](std::string_view text) { EventPlrMsg(text, UiFlags::ColorRed); });
RunScript("lua/init.lua");
RunScript("lua/user.lua");
RunScript("lua/init.lua", /*optional=*/false);
RunScript("lua/user.lua", /*optional=*/true);
LuaEvent("OnGameBoot");
}
@@ -133,7 +142,7 @@ void LuaEvent(std::string_view name)
return;
}
const sol::protected_function fn = trigger->as<sol::protected_function>();
CheckResult(fn());
CheckResult(fn(), /*optional=*/true);
}
sol::state &LuaState()