diff options
Diffstat (limited to 'source/Pickup.h')
| -rw-r--r-- | source/Pickup.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/Pickup.h b/source/Pickup.h index 6c5979e13..17dc379a7 100644 --- a/source/Pickup.h +++ b/source/Pickup.h @@ -2,12 +2,13 @@ #pragma once #include "Entity.h" +#include "Item.h" + class cPlayer; -class cItem; @@ -23,13 +24,12 @@ class cPickup : public: CLASS_PROTODEF(cPickup); - cPickup(int a_X, int a_Y, int a_Z, const cItem & a_Item, float a_SpeedX = 0.f, float a_SpeedY = 0.f, float a_SpeedZ = 0.f); //tolua_export - ~cPickup(); //tolua_export + cPickup(int a_MicroPosX, int a_MicroPosY, int a_MicroPosZ, const cItem & a_Item, float a_SpeedX = 0.f, float a_SpeedY = 0.f, float a_SpeedZ = 0.f); //tolua_export virtual void Initialize(cWorld * a_World) override; - cItem * GetItem(void) {return m_Item; } //tolua_export - const cItem * GetItem(void) const {return m_Item; } + cItem & GetItem(void) {return m_Item; } //tolua_export + const cItem & GetItem(void) const {return m_Item; } virtual void SpawnOn(cClientHandle & a_ClientHandle) override; @@ -51,7 +51,7 @@ private: float m_Timer; - cItem* m_Item; + cItem m_Item; bool m_bCollected; }; //tolua_export |