diff options
author | Loic Blot <loic.blot@unix-experience.fr> | 2016-10-08 12:21:41 +0200 |
---|---|---|
committer | Ner'zhul <nerzhul@users.noreply.github.com> | 2016-10-08 15:57:50 +0200 |
commit | 656faf7373587bc59b47986a28dbd2fce4c45474 (patch) | |
tree | 0d2414db105bfeaa1112576725da61bfdfc1edec /src/script/lua_api/l_inventory.h | |
parent | 9393e4a0a8e32905d32a9dc58131218aee318686 (diff) | |
download | minetest-656faf7373587bc59b47986a28dbd2fce4c45474.tar.gz minetest-656faf7373587bc59b47986a28dbd2fce4c45474.tar.bz2 minetest-656faf7373587bc59b47986a28dbd2fce4c45474.zip |
Player/LocalPlayer/RemotePlayer inheritance cleanup (part 2 on X)
* Server/Client Environments now have an helper to cast Player object in the right type to use it
* Server: use RemotePlayer everywhere and remove previous added casts
* Client: use LocalPlayer where needed
* Environment: remove unused functions (getPlayers(), getRandomConnectedPlayer(), getNearestConnectedPlayer())
Diffstat (limited to 'src/script/lua_api/l_inventory.h')
-rw-r--r-- | src/script/lua_api/l_inventory.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/script/lua_api/l_inventory.h b/src/script/lua_api/l_inventory.h index 2d4b29d0c..cc5333965 100644 --- a/src/script/lua_api/l_inventory.h +++ b/src/script/lua_api/l_inventory.h @@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "inventory.h" #include "inventorymanager.h" -class Player; +class RemotePlayer; /* InvRef @@ -112,7 +112,7 @@ public: // Creates an InvRef and leaves it on top of stack // Not callable from Lua; all references are created on the C side. static void create(lua_State *L, const InventoryLocation &loc); - static void createPlayer(lua_State *L, Player *player); + static void createPlayer(lua_State *L, RemotePlayer *player); static void createNodeMeta(lua_State *L, v3s16 p); static void Register(lua_State *L); }; @@ -123,11 +123,6 @@ private: static int l_get_inventory(lua_State *L); - static void inventory_set_list_from_lua(Inventory *inv, const char *name, - lua_State *L, int tableindex, int forcesize); - static void inventory_get_list_to_lua(Inventory *inv, const char *name, - lua_State *L); - public: static void Initialize(lua_State *L, int top); }; |