summaryrefslogtreecommitdiffstats
path: root/source/cPickup.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--source/cPickup.h21
1 files changed, 16 insertions, 5 deletions
diff --git a/source/cPickup.h b/source/cPickup.h
index a13767738..06d5fe301 100644
--- a/source/cPickup.h
+++ b/source/cPickup.h
@@ -14,24 +14,35 @@ class cItem;
-class cPickup : public cEntity //tolua_export
-{ //tolua_export
+// tolua_begin
+class cPickup :
+ public cEntity
+{
+ // tolua_end
+ typedef cEntity super;
+ // tolua_begin
+
public:
+ // tolua_end
CLASS_PROTOTYPE();
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(cPacket_PickupSpawn * a_PickupSpawnPacket); //tolua_export
~cPickup(); //tolua_export
+
+ virtual void Initialize(cWorld * a_World) override;
- cItem * GetItem() { return m_Item; } //tolua_export
+ cItem * GetItem(void) {return m_Item; } //tolua_export
+ const cItem * GetItem(void) const {return m_Item; }
- virtual cPacket * GetSpawnPacket(void) const override;
+ virtual void SpawnOn(cClientHandle & a_ClientHandle) override;
virtual bool CollectedBy( cPlayer* a_Dest ); //tolua_export
void Tick(float a_Dt);
void HandlePhysics(float a_Dt);
+ const Vector3f & GetSpeed(void) const {return m_Speed; }
+
private:
Vector3f m_Speed;