ryansnewell
/
mcserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implented IsFishing, SetIsFishing and GetFloaterID().

master
STRWarrior 2013-12-19 17:33:21 +01:00
parent 86bfed735e
commit 3d70d7198d
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Entities/Player.cpp
View File

@ -65,6 +65,8 @@ cPlayer::cPlayer(cClientHandle* a_Client, const AString & a_PlayerName)
, m_IsSubmerged(false) , m_IsSubmerged(false)
, m_IsFlying(false) , m_IsFlying(false)
, m_CanFly(false) , m_CanFly(false)
, m_IsFishing(false)
, m_FloaterID(-1)
, m_EatingFinishTick(-1) , m_EatingFinishTick(-1)
, m_IsChargingBow(false) , m_IsChargingBow(false)
, m_BowCharge(0) , m_BowCharge(0)

10
src/Entities/Player.h
View File

@ -253,6 +253,14 @@ public:
/// Returns true if the player is currently flying. /// Returns true if the player is currently flying.
bool IsFlying(void) const { return m_IsFlying; } bool IsFlying(void) const { return m_IsFlying; }
/// 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; }
int GetFloaterID(void) const { return m_FloaterID; }
// tolua_end // tolua_end
/// Starts eating the currently equipped item. Resets the eating timer and sends the proper animation packet /// Starts eating the currently equipped item. Resets the eating timer and sends the proper animation packet
@ -429,6 +437,7 @@ protected:
bool m_IsFlying; bool m_IsFlying;
bool m_IsSwimming; bool m_IsSwimming;
bool m_IsSubmerged; bool m_IsSubmerged;
bool m_IsFishing;
bool m_CanFly; // If this is true the player can fly. Even if he is not in creative. bool m_CanFly; // If this is true the player can fly. Even if he is not in creative.
@ -445,6 +454,7 @@ protected:
bool m_IsChargingBow; bool m_IsChargingBow;
int m_BowCharge; int m_BowCharge;
int m_FloaterID;
virtual void Destroyed(void); virtual void Destroyed(void);