diff options
author | Samuel Barney <samjbarney@gmail.com> | 2015-07-29 17:04:03 +0200 |
---|---|---|
committer | Samuel Barney <samjbarney@gmail.com> | 2015-07-29 17:49:30 +0200 |
commit | 804805d35a87c2acc9425d1762ad26b1ba2ec9ac (patch) | |
tree | 13b603c8bbf8177da92ce87f5413fb646d204f3f /src/Entities/Player.h | |
parent | Merge pull request #2376 from mjhanninen/fix-freebsd-build (diff) | |
download | cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.tar cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.tar.gz cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.tar.bz2 cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.tar.lz cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.tar.xz cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.tar.zst cuberite-804805d35a87c2acc9425d1762ad26b1ba2ec9ac.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Entities/Player.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Entities/Player.h b/src/Entities/Player.h index dffb61677..0fee6ef8a 100644 --- a/src/Entities/Player.h +++ b/src/Entities/Player.h @@ -319,9 +319,9 @@ public: /** returns true if the player has thrown out a floater. */ bool IsFishing(void) const { return m_IsFishing; } - void SetIsFishing(bool a_IsFishing, int a_FloaterID = -1) { m_IsFishing = a_IsFishing; m_FloaterID = a_FloaterID; } + void SetIsFishing(bool a_IsFishing, UInt32 a_FloaterID = cEntity::INVALID_ID) { m_IsFishing = a_IsFishing; m_FloaterID = a_FloaterID; } - int GetFloaterID(void) const { return m_FloaterID; } + UInt32 GetFloaterID(void) const { return m_FloaterID; } // tolua_end @@ -619,7 +619,7 @@ protected: bool m_IsChargingBow; int m_BowCharge; - int m_FloaterID; + UInt32 m_FloaterID; cTeam * m_Team; |