summaryrefslogtreecommitdiffstats
path: root/source/Entities/Pickup.h
diff options
context:
space:
mode:
authorAlexander Harkness <bearbin@gmail.com>2013-10-24 08:36:25 +0200
committerAlexander Harkness <bearbin@gmail.com>2013-10-24 08:36:25 +0200
commit54f5f71c9a3eb1d7d7516cc750e4bffba86bd585 (patch)
tree1ff9d4a148086e34f5b78751ec51d470928448ca /source/Entities/Pickup.h
parentAPIDump: Added cChatColor constants. (diff)
parentPickups now have collection delay when vomited (diff)
downloadcuberite-54f5f71c9a3eb1d7d7516cc750e4bffba86bd585.tar
cuberite-54f5f71c9a3eb1d7d7516cc750e4bffba86bd585.tar.gz
cuberite-54f5f71c9a3eb1d7d7516cc750e4bffba86bd585.tar.bz2
cuberite-54f5f71c9a3eb1d7d7516cc750e4bffba86bd585.tar.lz
cuberite-54f5f71c9a3eb1d7d7516cc750e4bffba86bd585.tar.xz
cuberite-54f5f71c9a3eb1d7d7516cc750e4bffba86bd585.tar.zst
cuberite-54f5f71c9a3eb1d7d7516cc750e4bffba86bd585.zip
Diffstat (limited to 'source/Entities/Pickup.h')
-rw-r--r--source/Entities/Pickup.h7
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