diff options
author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-10-24 01:30:20 +0200 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2013-10-24 01:30:20 +0200 |
commit | 4d2c810c64c38fd5530170d5c4d54956a5587fb2 (patch) | |
tree | 17c07b1a6eef15c83279f4530281bf7b986b06a3 /source/Entities/Pickup.h | |
parent | Merge remote-tracking branch 'upstream/master' (diff) | |
download | cuberite-4d2c810c64c38fd5530170d5c4d54956a5587fb2.tar cuberite-4d2c810c64c38fd5530170d5c4d54956a5587fb2.tar.gz cuberite-4d2c810c64c38fd5530170d5c4d54956a5587fb2.tar.bz2 cuberite-4d2c810c64c38fd5530170d5c4d54956a5587fb2.tar.lz cuberite-4d2c810c64c38fd5530170d5c4d54956a5587fb2.tar.xz cuberite-4d2c810c64c38fd5530170d5c4d54956a5587fb2.tar.zst cuberite-4d2c810c64c38fd5530170d5c4d54956a5587fb2.zip |
Diffstat (limited to '')
-rw-r--r-- | source/Entities/Pickup.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/Entities/Pickup.h b/source/Entities/Pickup.h index 488f91fb2..e4154f1d4 100644 --- a/source/Entities/Pickup.h +++ b/source/Entities/Pickup.h @@ -24,7 +24,7 @@ class cPickup : public: CLASS_PROTODEF(cPickup); - cPickup(double a_X, double a_Y, double a_Z, const cItem & a_Item, float a_SpeedX = 0.f, float a_SpeedY = 0.f, float a_SpeedZ = 0.f); // tolua_export + cPickup(double a_MicroPosX, double a_MicroPosY, double a_MicroPosZ, const cItem & a_Item, bool IsPlayerCreated, float a_SpeedX = 0.f, float a_SpeedY = 0.f, float a_SpeedZ = 0.f); // tolua_export cItem & GetItem(void) {return m_Item; } // tolua_export const cItem & GetItem(void) const {return m_Item; } @@ -40,6 +40,9 @@ public: /// Returns true if the pickup has already been collected bool IsCollected(void) const { return m_bCollected; } // tolua_export + + /// Returns true if created by player (i.e. vomiting), used for determining picking-up delay time + bool IsPlayerCreated(void) const { return m_bIsPlayerCreated; } // tolua_export private: Vector3d m_ResultingSpeed; //Can be used to modify the resulting speed for the current tick ;) @@ -52,6 +55,8 @@ private: cItem m_Item; bool m_bCollected; + + bool m_bIsPlayerCreated; }; // tolua_export |