]> git.lizzy.rs Git - dragonfireclient.git/blobdiff - src/scriptapi.cpp
Don't leak textures all over the place
[dragonfireclient.git] / src / scriptapi.cpp
index 61488abb4eb23b14ead3d841452a05dead171566..9fa927ff34e486d6b1e0e662b8665f2d54b8167b 100644 (file)
@@ -1847,6 +1847,20 @@ class InvRef
                return 1;
        }
 
+       // get_width(self, listname)
+       static int l_get_width(lua_State *L)
+       {
+               InvRef *ref = checkobject(L, 1);
+               const char *listname = luaL_checkstring(L, 2);
+               InventoryList *list = getlist(L, ref, listname);
+               if(list){
+                       lua_pushinteger(L, list->getWidth());
+               } else {
+                       lua_pushinteger(L, 0);
+               }
+               return 1;
+       }
+
        // set_size(self, listname, size)
        static int l_set_size(lua_State *L)
        {
@@ -1869,6 +1883,23 @@ class InvRef
                return 0;
        }
 
+       // set_width(self, listname, size)
+       static int l_set_width(lua_State *L)
+       {
+               InvRef *ref = checkobject(L, 1);
+               const char *listname = luaL_checkstring(L, 2);
+               int newwidth = luaL_checknumber(L, 3);
+               Inventory *inv = getinv(L, ref);
+               InventoryList *list = inv->getList(listname);
+               if(list){
+                       list->setWidth(newwidth);
+               } else {
+                       return 0;
+               }
+               reportInventoryChange(L, ref);
+               return 0;
+       }
+
        // get_stack(self, listname, i) -> itemstack
        static int l_get_stack(lua_State *L)
        {
@@ -2062,6 +2093,8 @@ const luaL_reg InvRef::methods[] = {
        method(InvRef, is_empty),
        method(InvRef, get_size),
        method(InvRef, set_size),
+       method(InvRef, get_width),
+       method(InvRef, set_width),
        method(InvRef, get_stack),
        method(InvRef, set_stack),
        method(InvRef, get_list),
@@ -2509,7 +2542,7 @@ class ObjectRef
                return 0;
        }
 
-       // punch(self, puncher, tool_capabilities, direction, time_from_last_punch)
+       // punch(self, puncher, time_from_last_punch, tool_capabilities, dir)
        static int l_punch(lua_State *L)
        {
                ObjectRef *ref = checkobject(L, 1);
@@ -2518,13 +2551,18 @@ class ObjectRef
                ServerActiveObject *puncher = getobject(puncher_ref);
                if(co == NULL) return 0;
                if(puncher == NULL) return 0;
-               ToolCapabilities toolcap = read_tool_capabilities(L, 3);
-               v3f dir = read_v3f(L, 4);
+               v3f dir;
+               if(lua_type(L, 5) != LUA_TTABLE)
+                       dir = co->getBasePosition() - puncher->getBasePosition();
+               else
+                       dir = read_v3f(L, 5);
                float time_from_last_punch = 1000000;
-               if(lua_isnumber(L, 5))
-                       time_from_last_punch = lua_tonumber(L, 5);
+               if(lua_isnumber(L, 3))
+                       time_from_last_punch = lua_tonumber(L, 3);
+               ToolCapabilities toolcap = read_tool_capabilities(L, 4);
+               dir.normalize();
                // Do it
-               puncher->punch(dir, &toolcap, puncher, time_from_last_punch);
+               co->punch(dir, &toolcap, puncher, time_from_last_punch);
                return 0;
        }
 
@@ -3810,6 +3848,15 @@ class EnvRef
                return 1;
        }
 
+       // EnvRef:clear_objects()
+       // clear all objects in the environment
+       static int l_clear_objects(lua_State *L)
+       {
+               EnvRef *o = checkobject(L, 1);
+               o->m_env->clearAllObjects();
+               return 0;
+       }
+
 public:
        EnvRef(ServerEnvironment *env):
                m_env(env)
@@ -3891,6 +3938,7 @@ const luaL_reg EnvRef::methods[] = {
        method(EnvRef, find_node_near),
        method(EnvRef, find_nodes_in_area),
        method(EnvRef, get_perlin),
+       method(EnvRef, clear_objects),
        {0,0}
 };
 
@@ -3928,6 +3976,10 @@ class LuaPseudoRandom
                        min = luaL_checkinteger(L, 2);
                if(!lua_isnil(L, 3))
                        max = luaL_checkinteger(L, 3);
+               if(max < min){
+                       errorstream<<"PseudoRandom.next(): max="<<max<<" min="<<min<<std::endl;
+                       throw LuaError(L, "PseudoRandom.next(): max < min");
+               }
                if(max - min != 32767 && max - min > 32767/5)
                        throw LuaError(L, "PseudoRandom.next() max-min is not 32767 and is > 32768/5. This is disallowed due to the bad random distribution the implementation would otherwise make.");
                PseudoRandom &pseudo = o->m_pseudo;
@@ -4166,6 +4218,20 @@ static int l_log(lua_State *L)
        return 0;
 }
 
+// request_shutdown()
+static int l_request_shutdown(lua_State *L)
+{
+       get_server(L)->requestShutdown();
+       return 0;
+}
+
+// get_server_status()
+static int l_get_server_status(lua_State *L)
+{
+       lua_pushstring(L, wide_to_narrow(get_server(L)->getStatusString()).c_str());
+       return 1;
+}
+
 // register_item_raw({lots of stuff})
 static int l_register_item_raw(lua_State *L)
 {
@@ -4556,6 +4622,56 @@ static int l_get_player_privs(lua_State *L)
        return 1;
 }
 
+// get_ban_list()
+static int l_get_ban_list(lua_State *L)
+{
+       lua_pushstring(L, get_server(L)->getBanDescription("").c_str());
+       return 1;
+}
+
+// get_ban_description()
+static int l_get_ban_description(lua_State *L)
+{
+       const char * ip_or_name = luaL_checkstring(L, 1);
+       lua_pushstring(L, get_server(L)->getBanDescription(std::string(ip_or_name)).c_str());
+       return 1;
+}
+
+// ban_player()
+static int l_ban_player(lua_State *L)
+{
+       const char * name = luaL_checkstring(L, 1);
+       Player *player = get_env(L)->getPlayer(name);
+       if(player == NULL)
+       {
+               lua_pushboolean(L, false); // no such player
+               return 1;
+       }
+       try
+       {
+               Address addr = get_server(L)->getPeerAddress(get_env(L)->getPlayer(name)->peer_id);
+               std::string ip_str = addr.serializeString();
+               get_server(L)->setIpBanned(ip_str, name);
+       }
+       catch(con::PeerNotFoundException) // unlikely
+       {
+               dstream << __FUNCTION_NAME << ": peer was not found" << std::endl;
+               lua_pushboolean(L, false); // error
+               return 1;
+       }
+       lua_pushboolean(L, true);
+       return 1;
+}
+
+// unban_player_or_ip()
+static int l_unban_player_of_ip(lua_State *L)
+{
+       const char * ip_or_name = luaL_checkstring(L, 1);
+       get_server(L)->unsetIpBanned(ip_or_name);
+       lua_pushboolean(L, true);
+       return 1;
+}
+
 // get_inventory(location)
 static int l_get_inventory(lua_State *L)
 {
@@ -4907,6 +5023,8 @@ static int l_rollback_revert_actions_by(lua_State *L)
 static const struct luaL_Reg minetest_f [] = {
        {"debug", l_debug},
        {"log", l_log},
+       {"request_shutdown", l_request_shutdown},
+       {"get_server_status", l_get_server_status},
        {"register_item_raw", l_register_item_raw},
        {"register_alias_raw", l_register_alias_raw},
        {"register_craft", l_register_craft},
@@ -4916,6 +5034,10 @@ static const struct luaL_Reg minetest_f [] = {
        {"chat_send_all", l_chat_send_all},
        {"chat_send_player", l_chat_send_player},
        {"get_player_privs", l_get_player_privs},
+       {"get_ban_list", l_get_ban_list},
+       {"get_ban_description", l_get_ban_description},
+       {"ban_player", l_ban_player},
+       {"unban_player_or_ip", l_unban_player_of_ip},
        {"get_inventory", l_get_inventory},
        {"create_detached_inventory_raw", l_create_detached_inventory_raw},
        {"get_dig_params", l_get_dig_params},
@@ -5506,6 +5628,8 @@ void scriptapi_on_player_receive_fields(lua_State *L,
 // If that is nil or on error, return false and stack is unchanged
 // If that is a function, returns true and pushes the
 // function onto the stack
+// If minetest.registered_items[name] doesn't exist, minetest.nodedef_default
+// is tried instead so unknown items can still be manipulated to some degree
 static bool get_item_callback(lua_State *L,
                const char *name, const char *callbackname)
 {
@@ -5518,9 +5642,15 @@ static bool get_item_callback(lua_State *L,
        // Should be a table
        if(lua_type(L, -1) != LUA_TTABLE)
        {
+               // Report error and clean up
                errorstream<<"Item \""<<name<<"\" not defined"<<std::endl;
                lua_pop(L, 1);
-               return false;
+
+               // Try minetest.nodedef_default instead
+               lua_getglobal(L, "minetest");
+               lua_getfield(L, -1, "nodedef_default");
+               lua_remove(L, -2);
+               luaL_checktype(L, -1, LUA_TTABLE);
        }
        lua_getfield(L, -1, callbackname);
        lua_remove(L, -2);
@@ -6353,7 +6483,7 @@ bool scriptapi_luaentity_add(lua_State *L, u16 id, const char *name)
 }
 
 void scriptapi_luaentity_activate(lua_State *L, u16 id,
-               const std::string &staticdata)
+               const std::string &staticdata, u32 dtime_s)
 {
        realitycheck(L);
        assert(lua_checkstack(L, 20));
@@ -6371,8 +6501,9 @@ void scriptapi_luaentity_activate(lua_State *L, u16 id,
                luaL_checktype(L, -1, LUA_TFUNCTION);
                lua_pushvalue(L, object); // self
                lua_pushlstring(L, staticdata.c_str(), staticdata.size());
-               // Call with 2 arguments, 0 results
-               if(lua_pcall(L, 2, 0, 0))
+               lua_pushinteger(L, dtime_s);
+               // Call with 3 arguments, 0 results
+               if(lua_pcall(L, 3, 0, 0))
                        script_error(L, "error running function on_activate: %s\n",
                                        lua_tostring(L, -1));
        }