diff options
| author | madmaxoft <github@xoft.cz> | 2013-10-24 15:05:23 +0200 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2013-10-24 15:05:23 +0200 |
| commit | 625c5f86deb0649403994ae4bbcc4a4cd07853d0 (patch) | |
| tree | 9989c98a6e7f93ae8bb2fcb617a9094a50869661 /source/Entities | |
| parent | APIDump: Documented cItemGrid and cPlayer. (diff) | |
| download | cuberite-625c5f86deb0649403994ae4bbcc4a4cd07853d0.tar cuberite-625c5f86deb0649403994ae4bbcc4a4cd07853d0.tar.gz cuberite-625c5f86deb0649403994ae4bbcc4a4cd07853d0.tar.bz2 cuberite-625c5f86deb0649403994ae4bbcc4a4cd07853d0.tar.lz cuberite-625c5f86deb0649403994ae4bbcc4a4cd07853d0.tar.xz cuberite-625c5f86deb0649403994ae4bbcc4a4cd07853d0.tar.zst cuberite-625c5f86deb0649403994ae4bbcc4a4cd07853d0.zip | |
Diffstat (limited to 'source/Entities')
| -rw-r--r-- | source/Entities/Pickup.cpp | 4 | ||||
| -rw-r--r-- | source/Entities/Pickup.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/Entities/Pickup.cpp b/source/Entities/Pickup.cpp index 50431f52e..bc8abd204 100644 --- a/source/Entities/Pickup.cpp +++ b/source/Entities/Pickup.cpp @@ -24,8 +24,8 @@ -cPickup::cPickup(double a_X, double a_Y, double a_Z, const cItem & a_Item, bool IsPlayerCreated, float a_SpeedX /* = 0.f */, float a_SpeedY /* = 0.f */, float a_SpeedZ /* = 0.f */) - : cEntity(etPickup, a_X, a_Y, a_Z, 0.2, 0.2) +cPickup::cPickup(double a_PosX, double a_PosY, double a_PosZ, const cItem & a_Item, bool IsPlayerCreated, float a_SpeedX /* = 0.f */, float a_SpeedY /* = 0.f */, float a_SpeedZ /* = 0.f */) + : cEntity(etPickup, a_PosX, a_PosY, a_PosZ, 0.2, 0.2) , m_Timer( 0.f ) , m_Item(a_Item) , m_bCollected( false ) diff --git a/source/Entities/Pickup.h b/source/Entities/Pickup.h index e4154f1d4..cbd34a922 100644 --- a/source/Entities/Pickup.h +++ b/source/Entities/Pickup.h @@ -24,7 +24,7 @@ class cPickup : public: CLASS_PROTODEF(cPickup); - 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 + cPickup(double a_PosX, double a_PosY, double a_PosZ, 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; } |