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/modchannels.cpp | |
| 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/modchannels.cpp')
| -rw-r--r-- | src/modchannels.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modchannels.cpp b/src/modchannels.cpp index a6babceca..301dcb092 100644 --- a/src/modchannels.cpp +++ b/src/modchannels.cpp @@ -22,7 +22,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <cassert> #include "util/basic_macros.h" -bool ModChannel::registerConsumer(u16 peer_id) +bool ModChannel::registerConsumer(session_t peer_id) { // ignore if peer_id already joined @@ -33,7 +33,7 @@ bool ModChannel::registerConsumer(u16 peer_id) return true; } -bool ModChannel::removeConsumer(u16 peer_id) +bool ModChannel::removeConsumer(session_t peer_id) { bool found = false; auto peer_removal_fct = [peer_id, &found](u16 p) { @@ -112,7 +112,7 @@ bool ModChannelMgr::removeChannel(const std::string &channel) return true; } -bool ModChannelMgr::joinChannel(const std::string &channel, u16 peer_id) +bool ModChannelMgr::joinChannel(const std::string &channel, session_t peer_id) { if (!channelRegistered(channel)) registerChannel(channel); @@ -120,7 +120,7 @@ bool ModChannelMgr::joinChannel(const std::string &channel, u16 peer_id) return m_registered_channels[channel]->registerConsumer(peer_id); } -bool ModChannelMgr::leaveChannel(const std::string &channel, u16 peer_id) +bool ModChannelMgr::leaveChannel(const std::string &channel, session_t peer_id) { if (!channelRegistered(channel)) return false; @@ -135,7 +135,7 @@ bool ModChannelMgr::leaveChannel(const std::string &channel, u16 peer_id) return consumerRemoved; } -void ModChannelMgr::leaveAllChannels(u16 peer_id) +void ModChannelMgr::leaveAllChannels(session_t peer_id) { for (auto &channel_it : m_registered_channels) channel_it.second->removeConsumer(peer_id); |