Merge pull request 'Fix FFI import' (#116) from fix/ffi into master

Reviewed-on: #116
This commit is contained in:
Lucas Schwiderski 2023-07-22 14:40:59 +02:00
commit a98b9fae95

View file

@ -61,11 +61,10 @@ local function patch_mod_loading_state()
if state == "load_package" and package_manager:update() then
log("StateBootLoadMods", "Packages loaded, loading mods")
self._state = "load_mods"
local mod_loader = require("scripts/mods/dml/init")
self._mod_loader = mod_loader
local ModLoader = require("scripts/mods/dml/init")
local mod_data = require("scripts/mods/mod_data")
mod_loader:init(mod_data, self._parent:gui())
self._mod_loader = ModLoader:new(mod_data, self._parent:gui())
elseif state == "load_mods" and self._mod_loader:update(dt) then
log("StateBootLoadMods", "Mods loaded, exiting")
return true, false
@ -128,7 +127,7 @@ local lua_libs = {
if is_io_enabled then
lua_libs.io = io
lua_libs.os = os
lua_libs.ffi = ffi
lua_libs.ffi = require("ffi")
end
Mods = {