From ad7daf7b52348e1b71aa803be10de5b2134cba11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Blot?= <nerzhul@users.noreply.github.com>
Date: Wed, 27 Sep 2017 19:47:36 +0200
Subject: 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
---
 src/emerge.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/emerge.h')

diff --git a/src/emerge.h b/src/emerge.h
index 005760150..135121b39 100644
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <map>
 #include <mutex>
+#include "network/networkprotocol.h"
 #include "irr_v3d.h"
 #include "util/container.h"
 #include "mapgen.h" // for MapgenParams
@@ -123,14 +124,14 @@ public:
 	bool isRunning();
 
 	bool enqueueBlockEmerge(
-		u16 peer_id,
+		session_t peer_id,
 		v3s16 blockpos,
 		bool allow_generate,
 		bool ignore_queue_limits=false);
 
 	bool enqueueBlockEmergeEx(
 		v3s16 blockpos,
-		u16 peer_id,
+		session_t peer_id,
 		u16 flags,
 		EmergeCompletionCallback callback,
 		void *callback_param);
-- 
cgit v1.2.3