summaryrefslogtreecommitdiff
path: root/src/itemdef.cpp
diff options
context:
space:
mode:
authorsapier <Sapier at GMX dot net>2013-11-13 21:46:14 +0100
committerkwolekr <kwolekr@minetest.net>2013-11-17 12:45:58 -0500
commitdc407e219f8b0394f3a4d10ea8379b8678d98d1c (patch)
treea045995d5fd0ca91464ea3379738b055e7e61a42 /src/itemdef.cpp
parentd419e4cbb65d899239fafb5027b16fb9cb564adf (diff)
downloadminetest-dc407e219f8b0394f3a4d10ea8379b8678d98d1c.tar.gz
minetest-dc407e219f8b0394f3a4d10ea8379b8678d98d1c.tar.bz2
minetest-dc407e219f8b0394f3a4d10ea8379b8678d98d1c.zip
Fix multicaller support in RequestQueue
Diffstat (limited to 'src/itemdef.cpp')
-rw-r--r--src/itemdef.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/itemdef.cpp b/src/itemdef.cpp
index 83a70f1d7..c520ea902 100644
--- a/src/itemdef.cpp
+++ b/src/itemdef.cpp
@@ -638,12 +638,9 @@ public:
{
GetRequest<std::string, ClientCached*, u8, u8>
request = m_get_clientcached_queue.pop();
- GetResult<std::string, ClientCached*, u8, u8>
- result;
- result.key = request.key;
- result.callers = request.callers;
- result.item = createClientCachedDirect(request.key, gamedef);
- request.dest->push_back(result);
+
+ m_get_clientcached_queue.pushResult(request,
+ createClientCachedDirect(request.key, gamedef));
}
#endif
}