krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

[Server] Add getModFolder() script function and Config environment

Browse source
This commit is contained in:
David Cernat 2017-09-23 13:52:51 +03:00
parent b5ce3cebbc
commit 3284769fef
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw-mp/Script/LuaState.cpp
View file

@ -75,6 +75,9 @@ LuaState::LuaState()
coreTable["PROTOCOL"] = TES3MP_PROTO_VERSION; coreTable["PROTOCOL"] = TES3MP_PROTO_VERSION;
coreTable["loadedMods"] = coreTable.create(); coreTable["loadedMods"] = coreTable.create();
configEnv = sol::environment(*lua, sol::create, lua->globals());
lua->set("Config", configEnv); // plain global environment for mod configuration
// errors in sol::functions catches only in debug build for better performance // errors in sol::functions catches only in debug build for better performance
#ifdef SOL_SAFE_FUNCTIONS #ifdef SOL_SAFE_FUNCTIONS
lua->set_function("ErrorHandler", [](sol::object error_msg) { lua->set_function("ErrorHandler", [](sol::object error_msg) {
@ -236,6 +239,10 @@ sol::environment LuaState::openScript(std::string homePath, std::string modname)
return homePath + "/data/" + modname + '/'; return homePath + "/data/" + modname + '/';
}); });
lua->set_function("getModFolder", [homePath, modname]() -> const string{
return homePath + "/mods/" + modname + '/';
});
lua->script_file(homePath + "/mods/" + modname + "/main.lua", env); lua->script_file(homePath + "/mods/" + modname + "/main.lua", env);
sol::table modinfo = env["ModInfo"]; sol::table modinfo = env["ModInfo"];

1
apps/openmw-mp/Script/LuaState.hpp
View file

@ -40,6 +40,7 @@ private:
private: private:
std::shared_ptr<sol::state> lua; std::shared_ptr<sol::state> lua;
sol::environment dataEnv; sol::environment dataEnv;
sol::environment configEnv;
std::unique_ptr<CommandController> cmdCtrl; std::unique_ptr<CommandController> cmdCtrl;
std::unique_ptr<EventController> eventCtrl; std::unique_ptr<EventController> eventCtrl;
std::unique_ptr<TimerController> timerCtrl; std::unique_ptr<TimerController> timerCtrl;