diff options
Diffstat (limited to 'src/lua')
| -rw-r--r-- | src/lua/embed/embed.h | 26 | ||||
| -rw-r--r-- | src/lua/jin.cpp | 3 | ||||
| -rw-r--r-- | src/lua/modules/graphics/je_lua_graphics.cpp | 2 |
3 files changed, 20 insertions, 11 deletions
diff --git a/src/lua/embed/embed.h b/src/lua/embed/embed.h index a063e65..4b1c6d9 100644 --- a/src/lua/embed/embed.h +++ b/src/lua/embed/embed.h @@ -14,30 +14,38 @@ namespace JinEngine }; // Embed scripts. -#include "scripts/graphics.lua.h" -#include "scripts/keyboard.lua.h" -#include "scripts/mouse.lua.h" -#include "scripts/boot.lua.h" + #include "scripts/graphics.lua.h" + #include "scripts/keyboard.lua.h" + #include "scripts/mouse.lua.h" + #include "scripts/boot.lua.h" // In order. - static const jin_Embed scripts[] = { + static const jin_Embed modules[] = { { "graphics.lua", graphics_lua }, { "keyboard.lua", keyboard_lua }, { "mouse.lua", mouse_lua }, - { "boot.lua", boot_lua }, { 0, 0 } }; - static void boot(lua_State* L) + static const jin_Embed boot_script = { "boot", boot_lua }; + + static void load(lua_State* L) { - for (int i = 0; scripts[i].file; ++i) + for (int i = 0; modules[i].file; ++i) { - const char* file = scripts[i].file, *source = scripts[i].source; + const char* file = modules[i].file, *source = modules[i].source; if (luax_loadbuffer(L, source, strlen(source), file) == 0) lua_call(L, 0, 0); } } + static void run(lua_State* L) + { + const char* file = boot_script.file, *source = boot_script.source; + if (luax_loadbuffer(L, source, strlen(source), file) == 0) + lua_call(L, 0, 0); + } + } // namespace Embed } // namespace JinEngine diff --git a/src/lua/jin.cpp b/src/lua/jin.cpp index b11488b..79a7bf8 100644 --- a/src/lua/jin.cpp +++ b/src/lua/jin.cpp @@ -95,8 +95,9 @@ namespace JinEngine luax_newtable(L); luax_setfieldstring(L, "cwd", cwd); luax_setfield(L, -2, "args"); + Embed::load(L); luax_clearstack(L); - JinEngine::Embed::boot(L); + Embed::run(L); } } // namespace Lua diff --git a/src/lua/modules/graphics/je_lua_graphics.cpp b/src/lua/modules/graphics/je_lua_graphics.cpp index 8ace62c..981e30f 100644 --- a/src/lua/modules/graphics/je_lua_graphics.cpp +++ b/src/lua/modules/graphics/je_lua_graphics.cpp @@ -34,7 +34,7 @@ namespace JinEngine namespace Lua { -#include "../../resources/font.ttf.h" + #include "../../resources/font.ttf.h" static struct { |