oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

fix this path todos

Browse source
This commit is contained in:
Desour 2025-02-22 15:40:37 +01:00
parent ef9e39d1c7
commit 8027e1e08c
2 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
builtin/init.lua
View file

@ -76,9 +76,10 @@ elseif INIT == "async_game" then
dofile(asyncpath .. "game.lua") dofile(asyncpath .. "game.lua")
elseif INIT == "client" then elseif INIT == "client" then
dofile(scriptdir .. "client" .. DIR_DELIM .. "init.lua") dofile(scriptdir .. "client" .. DIR_DELIM .. "init.lua")
elseif INIT == "sscsm" then elseif INIT == "sscsm" and core.get_current_modname() == "*client_builtin*" then
-- FIXME: different branch for sscsm_server
dofile(scriptdir .. "sscsm_client" .. DIR_DELIM .. "init.lua") dofile(scriptdir .. "sscsm_client" .. DIR_DELIM .. "init.lua")
elseif INIT == "sscsm" and core.get_current_modname() == "*server_builtin*" then
dofile(scriptdir .. "sscsm_server" .. DIR_DELIM .. "init.lua")
elseif INIT == "emerge" then elseif INIT == "emerge" then
dofile(scriptdir .. "emerge" .. DIR_DELIM .. "init.lua") dofile(scriptdir .. "emerge" .. DIR_DELIM .. "init.lua")
elseif INIT == "pause_menu" then elseif INIT == "pause_menu" then

10
src/script/sscsm/sscsm_environment.h
View file

@ -20,11 +20,11 @@ class SSCSMEnvironment : public Thread
{ {
std::shared_ptr<StupidChannel> m_channel; std::shared_ptr<StupidChannel> m_channel;
std::unique_ptr<SSCSMScripting> m_script; std::unique_ptr<SSCSMScripting> m_script;
// virtual file system. // the virtual file system.
// TODO: decide and doc how paths look like, maybe: // paths look like this:
// /client_builtin/subdir/foo.lua // *client_builtin*:subdir/foo.lua
// /server_builtin/subdir/foo.lua // *server_builtin*:subdir/foo.lua
// /mods/modname/subdir/foo.lua // modname:subdir/foo.lua
std::unique_ptr<ModVFS> m_vfs; std::unique_ptr<ModVFS> m_vfs;
void *run() override; void *run() override;