diff options
| author | kwolekr <kwolekr@minetest.net> | 2015-11-14 03:07:21 -0500 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2016-01-19 04:18:06 -0500 |
| commit | 9f988e3b962389e10a7cf010fd4bf0f81d70e31a (patch) | |
| tree | 16d87f8aceea1f90c5a69b785a614b78a3f29fb9 /src/emerge.h | |
| parent | b67eab3b0050a1f08d9c56138969d1a659ee7eac (diff) | |
| download | minetest-9f988e3b962389e10a7cf010fd4bf0f81d70e31a.tar.gz minetest-9f988e3b962389e10a7cf010fd4bf0f81d70e31a.tar.bz2 minetest-9f988e3b962389e10a7cf010fd4bf0f81d70e31a.zip | |
EmergeManager: Do not queue duplicate block requests
Diffstat (limited to 'src/emerge.h')
| -rw-r--r-- | src/emerge.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/emerge.h b/src/emerge.h index a143b660f..02bdf7e67 100644 --- a/src/emerge.h +++ b/src/emerge.h @@ -159,8 +159,15 @@ private: // Requires m_queue_mutex held EmergeThread *getOptimalThread(); - bool pushBlockEmergeData(v3s16 pos, u16 peer_requested, u16 flags, - EmergeCompletionCallback callback, void *callback_param); + + bool pushBlockEmergeData( + v3s16 pos, + u16 peer_requested, + u16 flags, + EmergeCompletionCallback callback, + void *callback_param, + bool *entry_already_exists); + bool popBlockEmergeData(v3s16 pos, BlockEmergeData *bedata); friend class EmergeThread; |