summaryrefslogtreecommitdiff
path: root/src/server.h
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-07-24 20:57:17 +0300
committerPerttu Ahola <celeron55@gmail.com>2012-07-24 20:57:17 +0300
commit2ac20982e0772b94b21d95b53519bd2164632d98 (patch)
tree3a2e7b783ff4362ac723dee22809a8e6b7f8750a /src/server.h
parent96eac87d47e4d9e815dff5c9f830326e515d4ea2 (diff)
downloadminetest-2ac20982e0772b94b21d95b53519bd2164632d98.tar.gz
minetest-2ac20982e0772b94b21d95b53519bd2164632d98.tar.bz2
minetest-2ac20982e0772b94b21d95b53519bd2164632d98.zip
Detached inventories
Diffstat (limited to 'src/server.h')
-rw-r--r--src/server.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/server.h b/src/server.h
index f170cf7e1..4316bc21f 100644
--- a/src/server.h
+++ b/src/server.h
@@ -538,6 +538,9 @@ public:
void queueBlockEmerge(v3s16 blockpos, bool allow_generate);
+ // Creates or resets inventory
+ Inventory* createDetachedInventory(const std::string &name);
+
// Envlock and conlock should be locked when using Lua
lua_State *getLua(){ return m_lua; }
@@ -627,6 +630,10 @@ private:
void sendMediaAnnouncement(u16 peer_id);
void sendRequestedMedia(u16 peer_id,
const core::list<MediaRequest> &tosend);
+
+ void sendDetachedInventory(const std::string &name, u16 peer_id);
+ void sendDetachedInventoryToAll(const std::string &name);
+ void sendDetachedInventories(u16 peer_id);
/*
Something random
@@ -828,6 +835,12 @@ private:
*/
std::map<s32, ServerPlayingSound> m_playing_sounds;
s32 m_next_sound_id;
+
+ /*
+ Detached inventories (behind m_env_mutex)
+ */
+ // key = name
+ std::map<std::string, Inventory*> m_detached_inventories;
};
/*