diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-09-27 19:47:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 19:47:36 +0200 |
| commit | ad7daf7b52348e1b71aa803be10de5b2134cba11 (patch) | |
| tree | e5a528d0e9be11f678d113dde3ec4b49f3d96c26 /src/emerge.h | |
| parent | 50b2185ced9dc64e054ce743bbc22d15ecdf6192 (diff) | |
| download | minetest-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.h')
| -rw-r--r-- | src/emerge.h | 5 |
1 files changed, 3 insertions, 2 deletions
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); |