From 6ff6929ca6c599418f98fe750c04a76774075c18 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Sat, 16 Nov 2013 20:58:17 +0000
Subject: General fixes [SEE DESC]

* Fixed faulty block face enumeration and functions
+ Added fireworks and exp bottle spawning
* Fixed arrows again
---
 source/Entities/ProjectileEntity.h | 55 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

(limited to 'source/Entities/ProjectileEntity.h')

diff --git a/source/Entities/ProjectileEntity.h b/source/Entities/ProjectileEntity.h
index f62b53a42..959e81ae5 100644
--- a/source/Entities/ProjectileEntity.h
+++ b/source/Entities/ProjectileEntity.h
@@ -34,6 +34,7 @@ public:
 		pkEnderPearl    = 65,
 		pkExpBottle     = 75,
 		pkSplashPotion  = 73,
+		pkFirework      = 76,
 		pkWitherSkull   = 66,
 		pkFishingFloat  = 90,
 	} ;
@@ -159,6 +160,7 @@ protected:
 	/// Timer for pickup collection animation or five minute timeout
 	float m_Timer;
 
+	/// Timer for client arrow position confirmation via TeleportEntity
 	float m_HitGroundTimer;
 
 	/// If true, the arrow is in the process of being collected - don't go to anyone else
@@ -262,6 +264,59 @@ protected:
 
 
 
+class cExpBottleEntity :
+	public cProjectileEntity
+{
+	typedef cProjectileEntity super;
+
+public:
+
+	// tolua_end
+
+	CLASS_PROTODEF(cExpBottleEntity);
+
+	cExpBottleEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed);
+
+protected:
+
+	// cProjectileEntity overrides:
+	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, char a_HitFace) override;
+
+	// tolua_begin
+
+};
+
+
+
+
+
+class cFireworkEntity :
+	public cProjectileEntity
+{
+	typedef cProjectileEntity super;
+
+public:
+
+	// tolua_end
+
+	CLASS_PROTODEF(cFireworkEntity);
+
+	cFireworkEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z);
+
+protected:
+
+	// cProjectileEntity overrides:
+	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, char a_HitFace) override;
+	virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override;
+
+	// tolua_begin
+
+};
+
+
+
+
+
 class cGhastFireballEntity :
 	public cProjectileEntity
 {
-- 
cgit v1.2.3