summaryrefslogtreecommitdiff
path: root/src/emerge.cpp
diff options
context:
space:
mode:
authorLoïc Blot <nerzhul@users.noreply.github.com>2017-09-27 19:47:36 +0200
committerGitHub <noreply@github.com>2017-09-27 19:47:36 +0200
commitad7daf7b52348e1b71aa803be10de5b2134cba11 (patch)
treee5a528d0e9be11f678d113dde3ec4b49f3d96c26 /src/emerge.cpp
parent50b2185ced9dc64e054ce743bbc22d15ecdf6192 (diff)
downloadminetest-ad7daf7b52348e1b71aa803be10de5b2134cba11.tar.gz
minetest-ad7daf7b52348e1b71aa803be10de5b2134cba11.tar.bz2
minetest-ad7daf7b52348e1b71aa803be10de5b2134cba11.zip
Add session_t typedef + remove unused functions (#6470)
* Add session_t typedef + remove unused functions u16 peer_id is used everywhere, to be more consistent and permit some evolutions on this type in the future (i'm working on a PoC), uniformize u16 peer_id to SessionId peer_id
Diffstat (limited to 'src/emerge.cpp')
-rw-r--r--src/emerge.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/emerge.cpp b/src/emerge.cpp
index f634e9114..e9d96c0ba 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -247,7 +247,7 @@ bool EmergeManager::isRunning()
bool EmergeManager::enqueueBlockEmerge(
- u16 peer_id,
+ session_t peer_id,
v3s16 blockpos,
bool allow_generate,
bool ignore_queue_limits)
@@ -264,7 +264,7 @@ bool EmergeManager::enqueueBlockEmerge(
bool EmergeManager::enqueueBlockEmergeEx(
v3s16 blockpos,
- u16 peer_id,
+ session_t peer_id,
u16 flags,
EmergeCompletionCallback callback,
void *callback_param)