From be10c0893e2e6d1852a027abccc4cd3cdc85a140 Mon Sep 17 00:00:00 2001 From: Loïc Blot Date: Sat, 30 Sep 2017 12:00:05 +0200 Subject: Make Player::peer_id server-side only and add getters and setters (#6478) * Make Player::peer_id server-side only and add getters and setters Player::peer_id has no sense client side, move it to server, make it private and add setter and getter Also add some PEER_ID_INEXISTENT instead of harcoded 0 --- src/content_sao.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/content_sao.cpp') diff --git a/src/content_sao.cpp b/src/content_sao.cpp index 1d120f0a1..819c63ac3 100644 --- a/src/content_sao.cpp +++ b/src/content_sao.cpp @@ -848,7 +848,7 @@ void PlayerSAO::addedToEnvironment(u32 dtime_s) ServerActiveObject::addedToEnvironment(dtime_s); ServerActiveObject::setBasePosition(m_base_position); m_player->setPlayerSAO(this); - m_player->peer_id = m_peer_id; + m_player->setPeerId(m_peer_id); m_last_good_position = m_base_position; } @@ -1359,7 +1359,7 @@ void PlayerSAO::disconnected() void PlayerSAO::unlinkPlayerSessionAndSave() { assert(m_player->getPlayerSAO() == this); - m_player->peer_id = 0; + m_player->setPeerId(PEER_ID_INEXISTENT); m_env->savePlayer(m_player); m_player->setPlayerSAO(NULL); m_env->removePlayer(m_player); -- cgit v1.2.3