|
@@ -72,24 +72,24 @@ public:
|
|
|
PlayerSAO(ServerEnvironment *env_, RemotePlayer *player_, session_t peer_id_,
|
|
|
bool is_singleplayer);
|
|
|
|
|
|
- ActiveObjectType getType() const { return ACTIVEOBJECT_TYPE_PLAYER; }
|
|
|
- ActiveObjectType getSendType() const { return ACTIVEOBJECT_TYPE_GENERIC; }
|
|
|
- std::string getDescription();
|
|
|
+ ActiveObjectType getType() const override { return ACTIVEOBJECT_TYPE_PLAYER; }
|
|
|
+ ActiveObjectType getSendType() const override { return ACTIVEOBJECT_TYPE_GENERIC; }
|
|
|
+ std::string getDescription() override;
|
|
|
|
|
|
/*
|
|
|
Active object <-> environment interface
|
|
|
*/
|
|
|
|
|
|
- void addedToEnvironment(u32 dtime_s);
|
|
|
- void removingFromEnvironment();
|
|
|
- bool isStaticAllowed() const { return false; }
|
|
|
- bool shouldUnload() const { return false; }
|
|
|
- std::string getClientInitializationData(u16 protocol_version);
|
|
|
- void getStaticData(std::string *result) const;
|
|
|
- void step(float dtime, bool send_recommended);
|
|
|
+ void addedToEnvironment(u32 dtime_s) override;
|
|
|
+ void removingFromEnvironment() override;
|
|
|
+ bool isStaticAllowed() const override { return false; }
|
|
|
+ bool shouldUnload() const override { return false; }
|
|
|
+ std::string getClientInitializationData(u16 protocol_version) override;
|
|
|
+ void getStaticData(std::string *result) const override;
|
|
|
+ void step(float dtime, bool send_recommended) override;
|
|
|
void setBasePosition(const v3f &position);
|
|
|
- void setPos(const v3f &pos);
|
|
|
- void moveTo(v3f pos, bool continuous);
|
|
|
+ void setPos(const v3f &pos) override;
|
|
|
+ void moveTo(v3f pos, bool continuous) override;
|
|
|
void setPlayerYaw(const float yaw);
|
|
|
// Data should not be sent at player initialization
|
|
|
void setPlayerYawAndSend(const float yaw);
|
|
@@ -110,8 +110,8 @@ public:
|
|
|
*/
|
|
|
|
|
|
u32 punch(v3f dir, const ToolCapabilities *toolcap, ServerActiveObject *puncher,
|
|
|
- float time_from_last_punch, u16 initial_wear = 0);
|
|
|
- void rightClick(ServerActiveObject *clicker);
|
|
|
+ float time_from_last_punch, u16 initial_wear = 0) override;
|
|
|
+ void rightClick(ServerActiveObject *clicker) override;
|
|
|
void setHP(s32 hp, const PlayerHPChangeReason &reason) override
|
|
|
{
|
|
|
return setHP(hp, reason, false);
|
|
@@ -124,13 +124,13 @@ public:
|
|
|
/*
|
|
|
Inventory interface
|
|
|
*/
|
|
|
- Inventory *getInventory() const;
|
|
|
- InventoryLocation getInventoryLocation() const;
|
|
|
- void setInventoryModified() {}
|
|
|
- std::string getWieldList() const { return "main"; }
|
|
|
- u16 getWieldIndex() const;
|
|
|
- ItemStack getWieldedItem(ItemStack *selected, ItemStack *hand = nullptr) const;
|
|
|
- bool setWieldedItem(const ItemStack &item);
|
|
|
+ Inventory *getInventory() const override;
|
|
|
+ InventoryLocation getInventoryLocation() const override;
|
|
|
+ void setInventoryModified() override {}
|
|
|
+ std::string getWieldList() const override { return "main"; }
|
|
|
+ u16 getWieldIndex() const override;
|
|
|
+ ItemStack getWieldedItem(ItemStack *selected, ItemStack *hand = nullptr) const override;
|
|
|
+ bool setWieldedItem(const ItemStack &item) override;
|
|
|
|
|
|
/*
|
|
|
PlayerSAO-specific
|
|
@@ -171,9 +171,9 @@ public:
|
|
|
m_is_singleplayer = is_singleplayer;
|
|
|
}
|
|
|
|
|
|
- bool getCollisionBox(aabb3f *toset) const;
|
|
|
- bool getSelectionBox(aabb3f *toset) const;
|
|
|
- bool collideWithObjects() const { return true; }
|
|
|
+ bool getCollisionBox(aabb3f *toset) const override;
|
|
|
+ bool getSelectionBox(aabb3f *toset) const override;
|
|
|
+ bool collideWithObjects() const override { return true; }
|
|
|
|
|
|
void finalize(RemotePlayer *player, const std::set<std::string> &privs);
|
|
|
|