diff options
author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-09-30 12:00:05 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-30 12:00:05 +0200 |
commit | be10c0893e2e6d1852a027abccc4cd3cdc85a140 (patch) | |
tree | eabfe8164007c420326f52bfc7e13e9be0f6bfb6 /src/content_sao.cpp | |
parent | f729b5d2bdc65ce3c51f1004c58cb93a37504b49 (diff) | |
download | minetest-be10c0893e2e6d1852a027abccc4cd3cdc85a140.tar.gz minetest-be10c0893e2e6d1852a027abccc4cd3cdc85a140.tar.bz2 minetest-be10c0893e2e6d1852a027abccc4cd3cdc85a140.zip |
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
Diffstat (limited to 'src/content_sao.cpp')
-rw-r--r-- | src/content_sao.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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); |