Fixed projectile source filenames, indentations

src/CMakeLists.txt

@@ -57,14 +57,14 @@ if (NOT MSVC)
 		Entities/Pickup.h
 		Entities/Player.h
 		Entities/ProjectileEntity.h
-		Entities/ProjectileArrow.h
+		Entities/ArrowEntity.h
-		Entities/ProjectileEgg.h
+		Entities/ThrownEggEntity.h
-		Entities/ProjectileEnderPearl.h
+		Entities/ThrownEnderPearlEntity.h
-		Entities/ProjectileExpBottle.h
+		Entities/ExpBottleEntity.h
-		Entities/ProjectileSnowball.h
+		Entities/ThrownSnowballEntity.h
-		Entities/ProjectileFireCharge.h
+		Entities/FireChargeEntity.h
-		Entities/ProjectileFirework.h
+		Entities/FireworkEntity.h
-		Entities/ProjectileGhastFireball.h
+		Entities/GhastFireballEntity.h
 		Entities/TNTEntity.h
 		Entities/ExpOrb.h
 		Entities/HangingEntity.h

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),
+	super(pkArrow, a_Creator, a_X, a_Y, a_Z, 0.5, 0.5),
-m_PickupState(psNoPickup),
+	m_PickupState(psNoPickup),
-m_DamageCoeff(2),
+	m_DamageCoeff(2),
-m_IsCritical(false),
+	m_IsCritical(false),
-m_Timer(0),
+	m_Timer(0),
-m_HitGroundTimer(0),
+	m_HitGroundTimer(0),
-m_bIsCollected(false),
+	m_bIsCollected(false),
-m_HitBlockPos(Vector3i(0, 0, 0))
+	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),
+	super(pkArrow, &a_Player, a_Player.GetThrowStartPos(), a_Player.GetThrowSpeed(a_Force * 1.5 * 20), 0.5, 0.5),
-m_PickupState(psInSurvivalOrCreative),
+	m_PickupState(psInSurvivalOrCreative),
-m_DamageCoeff(2),
+	m_DamageCoeff(2),
-m_IsCritical((a_Force >= 1)),
+	m_IsCritical((a_Force >= 1)),
-m_Timer(0),
+	m_Timer(0),
-m_HitGroundTimer(0),
+	m_HitGroundTimer(0),
-m_HasTeleported(false),
+	m_HasTeleported(false),
-m_bIsCollected(false),
+	m_bIsCollected(false),
-m_HitBlockPos(0, 0, 0)
+	m_HitBlockPos(0, 0, 0)
 {
 }
 

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;
 	

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);
 }

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;
 	

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);

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;
 	

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),
+	super(pkFirework, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25),
-m_ExplodeTimer(0),
+	m_ExplodeTimer(0),
-m_FireworkItem(a_Item)
+	m_FireworkItem(a_Item)
 {
 }
 

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;
 	

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);

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;
 	

src/Entities/ProjectileEntity.cpp

@@ -13,14 +13,14 @@
 #include "../ChunkMap.h"
 #include "../Chunk.h"
 
-#include "ProjectileArrow.h"
+#include "ArrowEntity.h"
-#include "ProjectileEgg.h"
+#include "ThrownEggEntity.h"
-#include "ProjectileEnderPearl.h"
+#include "ThrownEnderPearlEntity.h"
-#include "ProjectileExpBottle.h"
+#include "ExpBottleEntity.h"
-#include "ProjectileSnowball.h"
+#include "ThrownSnowballEntity.h"
-#include "ProjectileFireCharge.h"
+#include "FireChargeEntity.h"
-#include "ProjectileFirework.h"
+#include "FireworkEntity.h"
-#include "ProjectileGhastFireball.h"
+#include "GhastFireballEntity.h"
 
 
 

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);
 }

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;
 	

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);
 }

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;
 	

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);
 }

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;
 	

src/Items/ItemBow.h

@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "../Entities/ProjectileArrow.h"
+#include "../Entities/ArrowEntity.h"
 
 
 

src/Mobs/Blaze.cpp

@@ -3,7 +3,7 @@
 
 #include "Blaze.h"
 #include "../World.h"
-#include "../Entities/ProjectileFireCharge.h"
+#include "../Entities/FireChargeEntity.h"
 
 
 

src/Mobs/Ghast.cpp

@@ -3,7 +3,7 @@
 
 #include "Ghast.h"
 #include "../World.h"
-#include "../Entities/ProjectileGhastFireball.h"
+#include "../Entities/GhastFireballEntity.h"
 
 
 

src/Mobs/Skeleton.cpp

@@ -3,7 +3,7 @@
 
 #include "Skeleton.h"
 #include "../World.h"
-#include "../Entities/ProjectileArrow.h"
+#include "../Entities/ArrowEntity.h"
 
 
 

src/Protocol/Protocol125.cpp

@@ -26,7 +26,7 @@ Documentation:
 #include "../Root.h"
 #include "../Server.h"
 
-#include "../Entities/ProjectileArrow.h"
+#include "../Entities/ArrowEntity.h"
 #include "../Entities/Minecart.h"
 #include "../Entities/FallingBlock.h"
 

src/Protocol/Protocol17x.cpp

@@ -31,8 +31,8 @@ Implements the 1.7.x protocol classes:
 #include "../BlockEntities/MobHeadEntity.h"
 #include "../BlockEntities/FlowerPotEntity.h"
 #include "../CompositeChat.h"
-#include "../Entities/ProjectileArrow.h"
+#include "../Entities/ArrowEntity.h"
-#include "../Entities/ProjectileFirework.h"
+#include "../Entities/FireworkEntity.h"
 
 
 

src/WorldStorage/NBTChunkSerializer.cpp

@@ -28,7 +28,7 @@
 #include "../Entities/Boat.h"
 #include "../Entities/Minecart.h"
 #include "../Entities/Pickup.h"
-#include "../Entities/ProjectileArrow.h"
+#include "../Entities/ArrowEntity.h"
 #include "../Entities/TNTEntity.h"
 #include "../Entities/ExpOrb.h"
 #include "../Entities/HangingEntity.h"

src/WorldStorage/WSSAnvil.cpp

@@ -35,12 +35,12 @@
 #include "../Entities/FallingBlock.h"
 #include "../Entities/Minecart.h"
 #include "../Entities/Pickup.h"
-#include "../Entities/ProjectileArrow.h"
+#include "../Entities/ArrowEntity.h"
-#include "../Entities/ProjectileEgg.h"
+#include "../Entities/ThrownEggEntity.h"
-#include "../Entities/ProjectileEnderPearl.h"
+#include "../Entities/ThrownEnderPearlEntity.h"
-#include "../Entities/ProjectileSnowball.h"
+#include "../Entities/ThrownSnowballEntity.h"
-#include "../Entities/ProjectileFireCharge.h"
+#include "../Entities/FireChargeEntity.h"
-#include "../Entities/ProjectileGhastFireball.h"
+#include "../Entities/GhastFireballEntity.h"
 #include "../Entities/TNTEntity.h"
 #include "../Entities/ExpOrb.h"
 #include "../Entities/HangingEntity.h"