BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

[CSM] storage + fixes

Browse Source
This commit is contained in:
Loic Blot 2017-01-28 18:31:23 +01:00 committed by Loïc Blot
parent a50d07d39a
commit ba66fce833
7 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clientmods/preview/init.lua
View File

@ -1,3 +1,5 @@
local modname = core.get_current_modname() or "??"
-- This is an example function to ensure it's working properly, should be removed before merge -- This is an example function to ensure it's working properly, should be removed before merge
core.register_on_shutdown(function() core.register_on_shutdown(function()
print("[PREVIEW] shutdown client") print("[PREVIEW] shutdown client")
@ -38,5 +40,5 @@ core.register_chatcommand("dump", {
}) })
core.after(2, function() core.after(2, function()
print("After 2") print("[PREVIEW] loaded " .. modname .. " mod")
end) end)

2
src/script/clientscripting.cpp
View File

@ -22,6 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "client.h" #include "client.h"
#include "cpp_api/s_internal.h" #include "cpp_api/s_internal.h"
#include "lua_api/l_client.h" #include "lua_api/l_client.h"
#include "lua_api/l_storage.h"
#include "lua_api/l_sound.h" #include "lua_api/l_sound.h"
#include "lua_api/l_util.h" #include "lua_api/l_util.h"
@ -53,4 +54,5 @@ void ClientScripting::InitializeModApi(lua_State *L, int top)
ModApiUtil::InitializeClient(L, top); ModApiUtil::InitializeClient(L, top);
ModApiClient::Initialize(L, top); ModApiClient::Initialize(L, top);
ModApiSound::Initialize(L, top); ModApiSound::Initialize(L, top);
ModApiStorage::Initialize(L, top);
} }

1
src/script/lua_api/CMakeLists.txt
View File

@ -25,5 +25,6 @@ set(common_SCRIPT_LUA_API_SRCS
set(client_SCRIPT_LUA_API_SRCS set(client_SCRIPT_LUA_API_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/l_client.cpp ${CMAKE_CURRENT_SOURCE_DIR}/l_client.cpp
${CMAKE_CURRENT_SOURCE_DIR}/l_mainmenu.cpp ${CMAKE_CURRENT_SOURCE_DIR}/l_mainmenu.cpp
${CMAKE_CURRENT_SOURCE_DIR}/l_storage.cpp
${CMAKE_CURRENT_SOURCE_DIR}/l_sound.cpp ${CMAKE_CURRENT_SOURCE_DIR}/l_sound.cpp
PARENT_SCOPE) PARENT_SCOPE)

3
src/script/lua_api/l_client.h
View File

@ -23,8 +23,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "lua_api/l_base.h" #include "lua_api/l_base.h"
class ModApiClient: class ModApiClient: public ModApiBase
public ModApiBase
{ {
private: private:
// get_current_modname() // get_current_modname()

6
src/script/lua_api/l_util.cpp
View File

@ -532,12 +532,6 @@ void ModApiUtil::InitializeClient(lua_State *L, int top)
API_FCT(get_us_time); API_FCT(get_us_time);
API_FCT(setting_set);
API_FCT(setting_get);
API_FCT(setting_setbool);
API_FCT(setting_getbool);
API_FCT(setting_save);
API_FCT(parse_json); API_FCT(parse_json);
API_FCT(write_json); API_FCT(write_json);

2
src/server.cpp
View File

@ -3400,7 +3400,7 @@ void Server::getModNames(std::vector<std::string> &modlist)
modlist.push_back(it->name); modlist.push_back(it->name);
} }
const std::string Server::getBuiltinLuaPath() std::string Server::getBuiltinLuaPath()
{ {
return porting::path_share + DIR_DELIM + "builtin"; return porting::path_share + DIR_DELIM + "builtin";
} }

2
src/server.h
View File

@ -299,7 +299,7 @@ public:
virtual const ModSpec* getModSpec(const std::string &modname) const; virtual const ModSpec* getModSpec(const std::string &modname) const;
void getModNames(std::vector<std::string> &modlist); void getModNames(std::vector<std::string> &modlist);
std::string getBuiltinLuaPath(); std::string getBuiltinLuaPath();
inline const std::string &getWorldPath() const { return m_path_world; } std::string getWorldPath() const { return m_path_world; }
std::string getModStoragePath() const; std::string getModStoragePath() const;
inline bool isSingleplayer() inline bool isSingleplayer()