PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix: lua errors in standard libs initialization are nonthrowing

Browse Source
This commit is contained in:
MihailRis
2024-07-22 15:53:05 +03:00
parent b5d7634601
commit 2fe25f5dd5
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logic/scripting/scripting.cpp
+11 -5
View File
@@ -38,20 +38,26 @@ const ContentIndices* scripting::indices = nullptr;
BlocksController* scripting::blocks = nullptr; BlocksController* scripting::blocks = nullptr;
LevelController* scripting::controller = nullptr; LevelController* scripting::controller = nullptr;
static void load_script(const fs::path& name) { static void load_script(const fs::path& name, bool throwable) {
auto paths = scripting::engine->getPaths(); auto paths = scripting::engine->getPaths();
fs::path file = paths->getResources()/fs::path("scripts")/name; fs::path file = paths->getResources()/fs::path("scripts")/name;
std::string src = files::read_string(file); std::string src = files::read_string(file);
lua::execute(lua::get_main_thread(), 0, src, file.u8string()); auto L = lua::get_main_thread();
lua::loadbuffer(L, 0, src, file.u8string());
if (throwable) {
lua::call(L, 0, 0);
} else {
lua::call_nothrow(L, 0, 0);
}
} }
void scripting::initialize(Engine* engine) { void scripting::initialize(Engine* engine) {
scripting::engine = engine; scripting::engine = engine;
lua::initialize(); lua::initialize();
load_script(fs::path("stdlib.lua")); load_script(fs::path("stdlib.lua"), true);
load_script(fs::path("stdcmd.lua")); load_script(fs::path("stdcmd.lua"), true);
} }
[[nodiscard]] [[nodiscard]]
@@ -145,7 +151,7 @@ void scripting::on_world_load(LevelController* controller) {
scripting::indices = level->content->getIndices(); scripting::indices = level->content->getIndices();
scripting::blocks = controller->getBlocksController(); scripting::blocks = controller->getBlocksController();
scripting::controller = controller; scripting::controller = controller;
load_script("world.lua"); load_script("world.lua", false);
auto L = lua::get_main_thread(); auto L = lua::get_main_thread();
for (auto& pack : scripting::engine->getContentPacks()) { for (auto& pack : scripting::engine->getContentPacks()) {