diff options
| author | Loic Blot <loic.blot@unix-experience.fr> | 2016-10-30 16:12:09 +0100 |
|---|---|---|
| committer | Ner'zhul <nerzhul@users.noreply.github.com> | 2016-10-30 16:30:55 +0100 |
| commit | 595932a8602292f28333ce14e20cee4b6d8820c1 (patch) | |
| tree | 74969852c535f7100a30a7989cd49f1c5693f2ae /src/content_sao.h | |
| parent | 9d25242c5c1411d692254cf910345d51c9a24fa3 (diff) | |
| download | minetest-595932a8602292f28333ce14e20cee4b6d8820c1.tar.gz minetest-595932a8602292f28333ce14e20cee4b6d8820c1.tar.bz2 minetest-595932a8602292f28333ce14e20cee4b6d8820c1.zip | |
Fix overloading problems mentioned by clang
Diffstat (limited to 'src/content_sao.h')
| -rw-r--r-- | src/content_sao.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/content_sao.h b/src/content_sao.h index 4ea6277ff..5d837a466 100644 --- a/src/content_sao.h +++ b/src/content_sao.h @@ -73,7 +73,7 @@ public: ServerActiveObject *puncher=NULL, float time_from_last_punch=1000000); void rightClick(ServerActiveObject *clicker); - void setPos(v3f pos); + void setPos(const v3f &pos); void moveTo(v3f pos, bool continuous); float getMinimumSavedMovement(); std::string getDescription(); @@ -204,8 +204,12 @@ public: void setBasePosition(const v3f &position); void setPos(const v3f &pos); void moveTo(v3f pos, bool continuous); - void setYaw(const float yaw, bool send_data = true); - void setPitch(const float pitch, bool send_data = true); + void setYaw(const float yaw); + // Data should not be sent at player initialization + void setYawAndSend(const float yaw); + void setPitch(const float pitch); + // Data should not be sent at player initialization + void setPitchAndSend(const float pitch); f32 getPitch() const { return m_pitch; } f32 getRadPitch() const { return m_pitch * core::DEGTORAD; } // Deprecated @@ -220,7 +224,8 @@ public: ServerActiveObject *puncher, float time_from_last_punch); void rightClick(ServerActiveObject *clicker); - void setHP(s16 hp, bool direct = false); + void setHP(s16 hp); + void setHPRaw(s16 hp) { m_hp = hp; } s16 readDamage(); u16 getBreath() const { return m_breath; } void setBreath(const u16 breath); |