17 files changed, 58 insertions, 58 deletions

diff --git a/src/Entities/ProjectileArrow.cpp b/src/Entities/ArrowEntity.cpp
index 8bf680797..847b39bbc 100644
--- a/src/Entities/ProjectileArrow.cpp
+++ b/src/Entities/ArrowEntity.cpp
@@ -1,7 +1,7 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
 #include "Player.h"
-#include "ProjectileArrow.h"
+#include "ArrowEntity.h"
 #include "../Chunk.h"
 
 
@@ -9,14 +9,14 @@
 
 
 cArrowEntity::cArrowEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) :
-super(pkArrow, a_Creator, a_X, a_Y, a_Z, 0.5, 0.5),
-m_PickupState(psNoPickup),
-m_DamageCoeff(2),
-m_IsCritical(false),
-m_Timer(0),
-m_HitGroundTimer(0),
-m_bIsCollected(false),
-m_HitBlockPos(Vector3i(0, 0, 0))
+	super(pkArrow, a_Creator, a_X, a_Y, a_Z, 0.5, 0.5),
+	m_PickupState(psNoPickup),
+	m_DamageCoeff(2),
+	m_IsCritical(false),
+	m_Timer(0),
+	m_HitGroundTimer(0),
+	m_bIsCollected(false),
+	m_HitBlockPos(Vector3i(0, 0, 0))
 {
 	SetSpeed(a_Speed);
 	SetMass(0.1);
@@ -33,15 +33,15 @@ m_HitBlockPos(Vector3i(0, 0, 0))
 
 
 cArrowEntity::cArrowEntity(cPlayer & a_Player, double a_Force) :
-super(pkArrow, &a_Player, a_Player.GetThrowStartPos(), a_Player.GetThrowSpeed(a_Force * 1.5 * 20), 0.5, 0.5),
-m_PickupState(psInSurvivalOrCreative),
-m_DamageCoeff(2),
-m_IsCritical((a_Force >= 1)),
-m_Timer(0),
-m_HitGroundTimer(0),
-m_HasTeleported(false),
-m_bIsCollected(false),
-m_HitBlockPos(0, 0, 0)
+	super(pkArrow, &a_Player, a_Player.GetThrowStartPos(), a_Player.GetThrowSpeed(a_Force * 1.5 * 20), 0.5, 0.5),
+	m_PickupState(psInSurvivalOrCreative),
+	m_DamageCoeff(2),
+	m_IsCritical((a_Force >= 1)),
+	m_Timer(0),
+	m_HitGroundTimer(0),
+	m_HasTeleported(false),
+	m_bIsCollected(false),
+	m_HitBlockPos(0, 0, 0)
 {
 }
 
diff --git a/src/Entities/ProjectileArrow.h b/src/Entities/ArrowEntity.h
index 18c30feae..1fe3032ee 100644
--- a/src/Entities/ProjectileArrow.h
+++ b/src/Entities/ArrowEntity.h
@@ -1,5 +1,5 @@
 //
-//  ProjectileArrow.h
+//  ArrowEntity.h
 //
 
 #pragma once
@@ -13,7 +13,7 @@
 // tolua_begin
 
 class cArrowEntity :
-public cProjectileEntity
+	public cProjectileEntity
 {
 	typedef cProjectileEntity super;
 	
diff --git a/src/Entities/ProjectileExpBottle.cpp b/src/Entities/ExpBottleEntity.cpp
index 936be6a72..202dde942 100644
--- a/src/Entities/ProjectileExpBottle.cpp
+++ b/src/Entities/ExpBottleEntity.cpp
@@ -1,6 +1,6 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "ProjectileExpBottle.h"
+#include "ExpBottleEntity.h"
 #include "../World.h"
 
 
@@ -8,7 +8,7 @@
 
 
 cExpBottleEntity::cExpBottleEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) :
-super(pkExpBottle, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25)
+	super(pkExpBottle, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25)
 {
 	SetSpeed(a_Speed);
 }
diff --git a/src/Entities/ProjectileExpBottle.h b/src/Entities/ExpBottleEntity.h
index 070c412e4..b2043d8f1 100644
--- a/src/Entities/ProjectileExpBottle.h
+++ b/src/Entities/ExpBottleEntity.h
@@ -1,5 +1,5 @@
 //
-//  ProjectileExpBottle.h
+//  ExpBottleEntity.h
 //
 
 #pragma once
@@ -13,7 +13,7 @@
 // tolua_begin
 
 class cExpBottleEntity :
-public cProjectileEntity
+	public cProjectileEntity
 {
 	typedef cProjectileEntity super;
 	
diff --git a/src/Entities/ProjectileFireCharge.cpp b/src/Entities/FireChargeEntity.cpp
index 5bdb74462..aba32602f 100644
--- a/src/Entities/ProjectileFireCharge.cpp
+++ b/src/Entities/FireChargeEntity.cpp
@@ -1,6 +1,6 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "ProjectileFireCharge.h"
+#include "FireChargeEntity.h"
 #include "../World.h"
 
 
@@ -8,7 +8,7 @@
 
 
 cFireChargeEntity::cFireChargeEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) :
-super(pkFireCharge, a_Creator, a_X, a_Y, a_Z, 0.3125, 0.3125)
+	super(pkFireCharge, a_Creator, a_X, a_Y, a_Z, 0.3125, 0.3125)
 {
 	SetSpeed(a_Speed);
 	SetGravity(0);
diff --git a/src/Entities/ProjectileFireCharge.h b/src/Entities/FireChargeEntity.h
index bcf2b7af6..3924c337c 100644
--- a/src/Entities/ProjectileFireCharge.h
+++ b/src/Entities/FireChargeEntity.h
@@ -1,5 +1,5 @@
 //
-//  ProjectileFireCharge.h
+//  FireChargeEntity.h
 //
 
 #pragma once
@@ -13,7 +13,7 @@
 // tolua_begin
 
 class cFireChargeEntity :
-public cProjectileEntity
+	public cProjectileEntity
 {
 	typedef cProjectileEntity super;
 	
diff --git a/src/Entities/ProjectileFirework.cpp b/src/Entities/FireworkEntity.cpp
index dcb89fce3..403a53c84 100644
--- a/src/Entities/ProjectileFirework.cpp
+++ b/src/Entities/FireworkEntity.cpp
@@ -1,6 +1,6 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "ProjectileFirework.h"
+#include "FireworkEntity.h"
 #include "../World.h"
 #include "../Chunk.h"
 
@@ -9,9 +9,9 @@
 
 
 cFireworkEntity::cFireworkEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const cItem & a_Item) :
-super(pkFirework, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25),
-m_ExplodeTimer(0),
-m_FireworkItem(a_Item)
+	super(pkFirework, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25),
+	m_ExplodeTimer(0),
+	m_FireworkItem(a_Item)
 {
 }
 
diff --git a/src/Entities/ProjectileFirework.h b/src/Entities/FireworkEntity.h
index e7d7eacbf..c62ca9402 100644
--- a/src/Entities/ProjectileFirework.h
+++ b/src/Entities/FireworkEntity.h
@@ -1,5 +1,5 @@
 //
-//  ProjectileFirework.h
+//  FireworkEntity.h
 //
 
 #pragma once
@@ -13,7 +13,7 @@
 // tolua_begin
 
 class cFireworkEntity :
-public cProjectileEntity
+	public cProjectileEntity
 {
 	typedef cProjectileEntity super;
 	
diff --git a/src/Entities/ProjectileGhastFireball.cpp b/src/Entities/GhastFireballEntity.cpp
index cac622562..9e4cb387e 100644
--- a/src/Entities/ProjectileGhastFireball.cpp
+++ b/src/Entities/GhastFireballEntity.cpp
@@ -1,6 +1,6 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "ProjectileGhastFireball.h"
+#include "GhastFireballEntity.h"
 #include "../World.h"
 
 
@@ -8,7 +8,7 @@
 
 
 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)
+	super(pkGhastFireball, a_Creator, a_X, a_Y, a_Z, 1, 1)
 {
 	SetSpeed(a_Speed);
 	SetGravity(0);
diff --git a/src/Entities/ProjectileGhastFireball.h b/src/Entities/GhastFireballEntity.h
index 6dd37783e..9e4572c78 100644
--- a/src/Entities/ProjectileGhastFireball.h
+++ b/src/Entities/GhastFireballEntity.h
@@ -1,5 +1,5 @@
 //
-//  ProjectileGhastFireball.h
+//  GhastFireballEntity.h
 //
 
 #pragma once
@@ -13,7 +13,7 @@
 // tolua_begin
 
 class cGhastFireballEntity :
-public cProjectileEntity
+	public cProjectileEntity
 {
 	typedef cProjectileEntity super;
 	
diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp
index b2e6d469e..3e48d310c 100644
--- a/src/Entities/ProjectileEntity.cpp
+++ b/src/Entities/ProjectileEntity.cpp
@@ -13,14 +13,14 @@
 #include "../ChunkMap.h"
 #include "../Chunk.h"
 
-#include "ProjectileArrow.h"
-#include "ProjectileEgg.h"
-#include "ProjectileEnderPearl.h"
-#include "ProjectileExpBottle.h"
-#include "ProjectileSnowball.h"
-#include "ProjectileFireCharge.h"
-#include "ProjectileFirework.h"
-#include "ProjectileGhastFireball.h"
+#include "ArrowEntity.h"
+#include "ThrownEggEntity.h"
+#include "ThrownEnderPearlEntity.h"
+#include "ExpBottleEntity.h"
+#include "ThrownSnowballEntity.h"
+#include "FireChargeEntity.h"
+#include "FireworkEntity.h"
+#include "GhastFireballEntity.h"
 
 
 
diff --git a/src/Entities/ProjectileEgg.cpp b/src/Entities/ThrownEggEntity.cpp
index 3f6e6525e..224019091 100644
--- a/src/Entities/ProjectileEgg.cpp
+++ b/src/Entities/ThrownEggEntity.cpp
@@ -1,6 +1,6 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "ProjectileEgg.h"
+#include "ThrownEggEntity.h"
 #include "../World.h"
 
 
@@ -8,7 +8,7 @@
 
 
 cThrownEggEntity::cThrownEggEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) :
-super(pkEgg, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25)
+	super(pkEgg, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25)
 {
 	SetSpeed(a_Speed);
 }
diff --git a/src/Entities/ProjectileEgg.h b/src/Entities/ThrownEggEntity.h
index ba1f6420e..5ba8f051b 100644
--- a/src/Entities/ProjectileEgg.h
+++ b/src/Entities/ThrownEggEntity.h
@@ -1,5 +1,5 @@
 //
-//  ProjectileEgg.h
+//  ThrownEggEntity.h
 //
 
 #pragma once
@@ -13,7 +13,7 @@
 // tolua_begin
 
 class cThrownEggEntity :
-public cProjectileEntity
+	public cProjectileEntity
 {
 	typedef cProjectileEntity super;
 	
diff --git a/src/Entities/ProjectileEnderPearl.cpp b/src/Entities/ThrownEnderPearlEntity.cpp
index db32f47b7..c37161145 100644
--- a/src/Entities/ProjectileEnderPearl.cpp
+++ b/src/Entities/ThrownEnderPearlEntity.cpp
@@ -1,13 +1,13 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "ProjectileEnderPearl.h"
+#include "ThrownEnderPearlEntity.h"
 
 
 
 
 
 cThrownEnderPearlEntity::cThrownEnderPearlEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) :
-super(pkEnderPearl, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25)
+	super(pkEnderPearl, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25)
 {
 	SetSpeed(a_Speed);
 }
diff --git a/src/Entities/ProjectileEnderPearl.h b/src/Entities/ThrownEnderPearlEntity.h
index 39761ff48..ddee5babe 100644
--- a/src/Entities/ProjectileEnderPearl.h
+++ b/src/Entities/ThrownEnderPearlEntity.h
@@ -1,5 +1,5 @@
 //
-//  ProjectileEnderPearl.h
+//  ThrownEnderPearlEntity.h
 //
 
 #pragma once
@@ -13,7 +13,7 @@
 // tolua_begin
 
 class cThrownEnderPearlEntity :
-public cProjectileEntity
+	public cProjectileEntity
 {
 	typedef cProjectileEntity super;
 	
diff --git a/src/Entities/ProjectileSnowball.cpp b/src/Entities/ThrownSnowballEntity.cpp
index 536b9e791..427f630f7 100644
--- a/src/Entities/ProjectileSnowball.cpp
+++ b/src/Entities/ThrownSnowballEntity.cpp
@@ -1,6 +1,6 @@
 #include "Globals.h"  // NOTE: MSVC stupidness requires this to be the same across all modules
 
-#include "ProjectileSnowball.h"
+#include "ThrownSnowballEntity.h"
 #include "../World.h"
 
 
@@ -8,7 +8,7 @@
 
 
 cThrownSnowballEntity::cThrownSnowballEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) :
-super(pkSnowball, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25)
+	super(pkSnowball, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25)
 {
 	SetSpeed(a_Speed);
 }
diff --git a/src/Entities/ProjectileSnowball.h b/src/Entities/ThrownSnowballEntity.h
index 2443d05c6..a09512e37 100644
--- a/src/Entities/ProjectileSnowball.h
+++ b/src/Entities/ThrownSnowballEntity.h
@@ -1,5 +1,5 @@
 //
-//  ProjectileSnowball.h
+//  ThrownSnowballEntity.h
 //
 
 #pragma once
@@ -13,7 +13,7 @@
 // tolua_begin
 
 class cThrownSnowballEntity :
-public cProjectileEntity
+	public cProjectileEntity
 {
 	typedef cProjectileEntity super;