summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-12-06 18:59:52 +0200
committerPerttu Ahola <celeron55@gmail.com>2012-01-02 02:59:14 +0200
commite48ccd79430db7c9e25209fdff51f8f36e20f202 (patch)
tree337117a8e98c83946bf26b35d05ac988523b8f10 /src
parent6be5441176a14137b92f03d9d519234ebee28f6c (diff)
downloadminetest-e48ccd79430db7c9e25209fdff51f8f36e20f202.tar.gz
minetest-e48ccd79430db7c9e25209fdff51f8f36e20f202.tar.bz2
minetest-e48ccd79430db7c9e25209fdff51f8f36e20f202.zip
Add ObjectRef:get_inventory() and add stuff to documentation comments
Diffstat (limited to 'src')
-rw-r--r--src/scriptapi.cpp22
1 files changed, 18 insertions, 4 deletions
diff --git a/src/scriptapi.cpp b/src/scriptapi.cpp
index c6a44c914..4dcb66c77 100644
--- a/src/scriptapi.cpp
+++ b/src/scriptapi.cpp
@@ -2005,9 +2005,21 @@ private:
return 1;
}
- // inventory_set_list(self, name, {item1, item2, ...})
+ // get_inventory(self)
+ static int l_get_inventory(lua_State *L)
+ {
+ ObjectRef *ref = checkobject(L, 1);
+ ServerRemotePlayer *player = getplayer(ref);
+ if(player == NULL) return 0;
+ // Do it
+ InvRef::createPlayer(L, player);
+ return 1;
+ }
+
+ // deprecated: inventory_set_list(self, name, {item1, item2, ...})
static int l_inventory_set_list(lua_State *L)
{
+ infostream<<"Deprecated: inventory_set_list"<<std::endl;
ObjectRef *ref = checkobject(L, 1);
ServerRemotePlayer *player = getplayer(ref);
if(player == NULL) return 0;
@@ -2019,9 +2031,10 @@ private:
return 0;
}
- // inventory_get_list(self, name)
+ // deprecated: inventory_get_list(self, name)
static int l_inventory_get_list(lua_State *L)
{
+ infostream<<"Deprecated: inventory_get_list"<<std::endl;
ObjectRef *ref = checkobject(L, 1);
ServerRemotePlayer *player = getplayer(ref);
if(player == NULL) return 0;
@@ -2179,8 +2192,9 @@ const luaL_reg ObjectRef::methods[] = {
method(ObjectRef, setsprite),
// Player-only
method(ObjectRef, get_player_name),
- method(ObjectRef, inventory_set_list),
- method(ObjectRef, inventory_get_list),
+ method(ObjectRef, get_inventory),
+ method(ObjectRef, inventory_set_list), // deprecated
+ method(ObjectRef, inventory_get_list), // deprecated
method(ObjectRef, get_wielded_itemstring),
method(ObjectRef, get_wielded_item),
method(ObjectRef, get_look_dir),