summaryrefslogtreecommitdiff
path: root/src/content_sao.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/content_sao.h')
-rw-r--r--src/content_sao.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/content_sao.h b/src/content_sao.h
index 0ff95059e..b62551f51 100644
--- a/src/content_sao.h
+++ b/src/content_sao.h
@@ -19,7 +19,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#pragma once
-#include <util/numeric.h>
+#include "network/networkprotocol.h"
+#include "util/numeric.h"
#include "serverobject.h"
#include "itemgroup.h"
#include "object_properties.h"
@@ -196,7 +197,8 @@ class RemotePlayer;
class PlayerSAO : public UnitSAO
{
public:
- PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, u16 peer_id_, bool is_singleplayer);
+ PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, session_t peer_id_,
+ bool is_singleplayer);
~PlayerSAO();
ActiveObjectType getType() const
{ return ACTIVEOBJECT_TYPE_PLAYER; }
@@ -311,7 +313,7 @@ public:
void disconnected();
RemotePlayer *getPlayer() { return m_player; }
- u16 getPeerID() const { return m_peer_id; }
+ session_t getPeerID() const { return m_peer_id; }
// Cheat prevention
@@ -372,7 +374,7 @@ private:
void unlinkPlayerSessionAndSave();
RemotePlayer *m_player = nullptr;
- u16 m_peer_id = 0;
+ session_t m_peer_id = 0;
Inventory *m_inventory = nullptr;
s16 m_damage = 0;