Merge branch 'master' of https://github.com/minetest/minetest

[dragonfireclient.git] / src / script / lua_api / l_item.cpp

diff --git a/src/script/lua_api/l_item.cpp b/src/script/lua_api/l_item.cpp
index 27c1b887592c48cb02ebf11b5ddabc064c5d83cd..bae6701a095eb803a50ad704a7853a5c06ed2b97 100644 (file)
--- a/src/script/lua_api/l_item.cpp
+++ b/src/script/lua_api/l_item.cpp
@@ -28,7 +28,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "server.h"
 #include "inventory.h"
 #include "log.h"
-
+#include "script/cpp_api/s_base.h"
+#ifndef SERVER
+#include "client/client.h"
+#include "client/renderingengine.h"
+#include "client/shader.h"
+#endif
 
 // garbage collector
 int LuaItemStack::gc_object(lua_State *L)
@@ -552,9 +557,9 @@ int ModApiItemMod::l_register_item_raw(lua_State *L)
 
        // Get the writable item and node definition managers from the server
        IWritableItemDefManager *idef =
-                       getServer(L)->getWritableItemDefManager();
+                       getGameDef(L)->getWritableItemDefManager();
        NodeDefManager *ndef =
-                       getServer(L)->getWritableNodeDefManager();
+                       getGameDef(L)->getWritableNodeDefManager();
 
        // Check if name is defined
        std::string name;
@@ -605,8 +610,9 @@ int ModApiItemMod::l_register_item_raw(lua_State *L)
                                        + itos(MAX_REGISTERED_CONTENT+1)
                                        + ") exceeded (" + name + ")");
                }
+               
        }
-
+       
        return 0; /* number of results */
 }
 
@@ -617,12 +623,12 @@ int ModApiItemMod::l_unregister_item_raw(lua_State *L)
        std::string name = luaL_checkstring(L, 1);
 
        IWritableItemDefManager *idef =
-                       getServer(L)->getWritableItemDefManager();
+                       getGameDef(L)->getWritableItemDefManager();
 
        // Unregister the node
        if (idef->get(name).type == ITEM_NODE) {
                NodeDefManager *ndef =
-                       getServer(L)->getWritableNodeDefManager();
+                       getGameDef(L)->getWritableNodeDefManager();
                ndef->removeNode(name);
        }
 
@@ -640,7 +646,7 @@ int ModApiItemMod::l_register_alias_raw(lua_State *L)
 
        // Get the writable item definition manager from the server
        IWritableItemDefManager *idef =
-                       getServer(L)->getWritableItemDefManager();
+                       getGameDef(L)->getWritableItemDefManager();
 
        idef->registerAlias(name, convert_to);