Fix a memleak before assertion in l_get_mod_storage

[minetest.git] / src / script / scripting_client.cpp

diff --git a/src/script/scripting_client.cpp b/src/script/scripting_client.cpp
index b121f3712252c6efd89cdd529f7e99d02e6fe8a2..a6511ffd57690d6ef07403f26c1f6d49855240c0 100644 (file)
--- a/src/script/scripting_client.cpp
+++ b/src/script/scripting_client.cpp
@@ -23,7 +23,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "cpp_api/s_internal.h"
 #include "lua_api/l_client.h"
 #include "lua_api/l_env.h"
+#include "lua_api/l_item.h"
 #include "lua_api/l_minimap.h"
+#include "lua_api/l_modchannels.h"
+#include "lua_api/l_particles_local.h"
 #include "lua_api/l_storage.h"
 #include "lua_api/l_sound.h"
 #include "lua_api/l_util.h"
@@ -32,10 +35,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_localplayer.h"
 #include "lua_api/l_camera.h"
 
-ClientScripting::ClientScripting(Client *client)
+ClientScripting::ClientScripting(Client *client):
+       ScriptApiBase(ScriptingType::Client)
 {
        setGameDef(client);
-       setType(ScriptingType::Client);
 
        SCRIPTAPI_PRECHECKHEADER
 
@@ -58,9 +61,6 @@ ClientScripting::ClientScripting(Client *client)
        lua_pushstring(L, "client");
        lua_setglobal(L, "INIT");
 
-       lua_pushstring(L, "/");
-       lua_setglobal(L, "DIR_DELIM");
-
        infostream << "SCRIPTAPI: Initialized client game modules" << std::endl;
 }
 
@@ -72,11 +72,14 @@ void ClientScripting::InitializeModApi(lua_State *L, int top)
        NodeMetaRef::RegisterClient(L);
        LuaLocalPlayer::Register(L);
        LuaCamera::Register(L);
+       ModChannelRef::Register(L);
 
        ModApiUtil::InitializeClient(L, top);
        ModApiClient::Initialize(L, top);
        ModApiStorage::Initialize(L, top);
        ModApiEnvMod::InitializeClient(L, top);
+       ModApiChannels::Initialize(L, top);
+       ModApiParticlesLocal::Initialize(L, top);
 }
 
 void ClientScripting::on_client_ready(LocalPlayer *localplayer)