Run callback in IDropAction, refactor function arguments

[oweals/minetest.git] / src / script / scripting_server.cpp

diff --git a/src/script/scripting_server.cpp b/src/script/scripting_server.cpp
index ce56fcf195aac8b0150ece2837f4830d7223ef25..1eee24c61a0f35ecd6076f3f7c6ce9d9b8245aa4 100644 (file)
--- a/src/script/scripting_server.cpp
+++ b/src/script/scripting_server.cpp
@@ -30,6 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "lua_api/l_item.h"
 #include "lua_api/l_itemstackmeta.h"
 #include "lua_api/l_mapgen.h"
+#include "lua_api/l_modchannels.h"
 #include "lua_api/l_nodemeta.h"
 #include "lua_api/l_nodetimer.h"
 #include "lua_api/l_noise.h"
@@ -47,7 +48,8 @@ extern "C" {
 #include "lualib.h"
 }
 
-ServerScripting::ServerScripting(Server* server)
+ServerScripting::ServerScripting(Server* server):
+               ScriptApiBase(ScriptingType::Server)
 {
        setGameDef(server);
 
@@ -82,19 +84,6 @@ ServerScripting::ServerScripting(Server* server)
 
 void ServerScripting::InitializeModApi(lua_State *L, int top)
 {
-       // Initialize mod api modules
-       ModApiCraft::Initialize(L, top);
-       ModApiEnvMod::Initialize(L, top);
-       ModApiInventory::Initialize(L, top);
-       ModApiItemMod::Initialize(L, top);
-       ModApiMapgen::Initialize(L, top);
-       ModApiParticles::Initialize(L, top);
-       ModApiRollback::Initialize(L, top);
-       ModApiServer::Initialize(L, top);
-       ModApiUtil::Initialize(L, top);
-       ModApiHttp::Initialize(L, top);
-       ModApiStorage::Initialize(L, top);
-
        // Register reference classes (userdata)
        InvRef::Register(L);
        ItemStackMetaRef::Register(L);
@@ -104,6 +93,7 @@ void ServerScripting::InitializeModApi(lua_State *L, int top)
        LuaPerlinNoiseMap::Register(L);
        LuaPseudoRandom::Register(L);
        LuaPcgRandom::Register(L);
+       LuaRaycast::Register(L);
        LuaSecureRandom::Register(L);
        LuaVoxelManip::Register(L);
        NodeMetaRef::Register(L);
@@ -111,6 +101,21 @@ void ServerScripting::InitializeModApi(lua_State *L, int top)
        ObjectRef::Register(L);
        LuaSettings::Register(L);
        StorageRef::Register(L);
+       ModChannelRef::Register(L);
+
+       // Initialize mod api modules
+       ModApiCraft::Initialize(L, top);
+       ModApiEnvMod::Initialize(L, top);
+       ModApiInventory::Initialize(L, top);
+       ModApiItemMod::Initialize(L, top);
+       ModApiMapgen::Initialize(L, top);
+       ModApiParticles::Initialize(L, top);
+       ModApiRollback::Initialize(L, top);
+       ModApiServer::Initialize(L, top);
+       ModApiUtil::Initialize(L, top);
+       ModApiHttp::Initialize(L, top);
+       ModApiStorage::Initialize(L, top);
+       ModApiChannels::Initialize(L, top);
 }
 
 void log_deprecated(const std::string &message)