4 files changed, 83 insertions, 74 deletions

diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp
index ab7753d41..3a5ac059b 100644
--- a/src/Entities/ProjectileEntity.cpp
+++ b/src/Entities/ProjectileEntity.cpp
@@ -19,6 +19,7 @@
 #include "ProjectileExpBottle.h"
 #include "ProjectileSnowball.h"
 #include "ProjectileFireCharge.h"
+#include "ProjectileGhastFireball.h"
 
 
 
@@ -478,47 +479,4 @@ void cFireworkEntity::Tick(float a_Dt, cChunk & a_Chunk)
 	}
 
 	m_ExplodeTimer++;
-}
-
-
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// cGhastFireballEntity :
-
-cGhastFireballEntity::cGhastFireballEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) :
-	super(pkGhastFireball, a_Creator, a_X, a_Y, a_Z, 1, 1)
-{
-	SetSpeed(a_Speed);
-	SetGravity(0);
-}
-
-
-
-
-
-void cGhastFireballEntity::Explode(int a_BlockX, int a_BlockY, int a_BlockZ)
-{
-	m_World->DoExplosionAt(1, a_BlockX, a_BlockY, a_BlockZ, true, esGhastFireball, this);
-}
-
-
-
-
-
-void cGhastFireballEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace)
-{
-	Destroy();
-	Explode((int)floor(a_HitPos.x), (int)floor(a_HitPos.y), (int)floor(a_HitPos.z));
-}
-
-
-
-
-
-void cGhastFireballEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos)
-{
-	Destroy();
-	Explode((int)floor(a_HitPos.x), (int)floor(a_HitPos.y), (int)floor(a_HitPos.z));
 }
\ No newline at end of file
diff --git a/src/Entities/ProjectileEntity.h b/src/Entities/ProjectileEntity.h
index d2cca9c75..c9b1588ef 100644
--- a/src/Entities/ProjectileEntity.h
+++ b/src/Entities/ProjectileEntity.h
@@ -134,37 +134,6 @@ private:
 
 
 
-class cGhastFireballEntity :
-	public cProjectileEntity
-{
-	typedef cProjectileEntity super;
-
-public:
-
-	// tolua_end
-	
-	CLASS_PROTODEF(cGhastFireballEntity);
-	
-	cGhastFireballEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed);
-	
-protected:
-
-	void Explode(int a_BlockX, int a_BlockY, int a_BlockZ);
-	
-	// cProjectileEntity overrides:
-	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
-	virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
-
-	// TODO: Deflecting the fireballs by arrow- or sword- hits
-	
-	// tolua_begin
-	
-} ;
-
-
-
-
-
 // tolua_end
 
 
diff --git a/src/Entities/ProjectileGhastFireball.cpp b/src/Entities/ProjectileGhastFireball.cpp
new file mode 100644
index 000000000..b8325aea2
--- /dev/null
+++ b/src/Entities/ProjectileGhastFireball.cpp
@@ -0,0 +1,44 @@
+#include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
+
+#include "ProjectileGhastFireball.h"
+#include "../World.h"
+
+
+
+
+
+cGhastFireballEntity::cGhastFireballEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) :
+super(pkGhastFireball, a_Creator, a_X, a_Y, a_Z, 1, 1)
+{
+	SetSpeed(a_Speed);
+	SetGravity(0);
+}
+
+
+
+
+
+void cGhastFireballEntity::Explode(int a_BlockX, int a_BlockY, int a_BlockZ)
+{
+	m_World->DoExplosionAt(1, a_BlockX, a_BlockY, a_BlockZ, true, esGhastFireball, this);
+}
+
+
+
+
+
+void cGhastFireballEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace)
+{
+	Destroy();
+	Explode((int)floor(a_HitPos.x), (int)floor(a_HitPos.y), (int)floor(a_HitPos.z));
+}
+
+
+
+
+
+void cGhastFireballEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos)
+{
+	Destroy();
+	Explode((int)floor(a_HitPos.x), (int)floor(a_HitPos.y), (int)floor(a_HitPos.z));
+}
\ No newline at end of file
diff --git a/src/Entities/ProjectileGhastFireball.h b/src/Entities/ProjectileGhastFireball.h
new file mode 100644
index 000000000..7aee1689a
--- /dev/null
+++ b/src/Entities/ProjectileGhastFireball.h
@@ -0,0 +1,38 @@
+//
+//  ProjectileGhastFireball.h
+//
+
+#pragma once
+
+#include "ProjectileEntity.h"
+
+
+
+
+
+class cGhastFireballEntity :
+public cProjectileEntity
+{
+	typedef cProjectileEntity super;
+	
+public:
+	
+	// tolua_end
+	
+	CLASS_PROTODEF(cGhastFireballEntity);
+	
+	cGhastFireballEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed);
+	
+protected:
+	
+	void Explode(int a_BlockX, int a_BlockY, int a_BlockZ);
+	
+	// cProjectileEntity overrides:
+	virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
+	virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
+	
+	// TODO: Deflecting the fireballs by arrow- or sword- hits
+	
+	// tolua_begin
+	
+} ;
\ No newline at end of file