summaryrefslogtreecommitdiffstats
path: root/src/Entities/ProjectileArrow.cpp
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-04-28 02:03:06 +0200
committerarchshift <admin@archshift.com>2014-04-28 02:05:18 +0200
commit9b0cb3fd97701370915a9a5b3d5b237fa7f90e06 (patch)
tree77686c50eb428a11fe0e539335e638dfb6eb8a6d /src/Entities/ProjectileArrow.cpp
parentFixed ToLua errors, added newlines (diff)
downloadcuberite-9b0cb3fd97701370915a9a5b3d5b237fa7f90e06.tar
cuberite-9b0cb3fd97701370915a9a5b3d5b237fa7f90e06.tar.gz
cuberite-9b0cb3fd97701370915a9a5b3d5b237fa7f90e06.tar.bz2
cuberite-9b0cb3fd97701370915a9a5b3d5b237fa7f90e06.tar.lz
cuberite-9b0cb3fd97701370915a9a5b3d5b237fa7f90e06.tar.xz
cuberite-9b0cb3fd97701370915a9a5b3d5b237fa7f90e06.tar.zst
cuberite-9b0cb3fd97701370915a9a5b3d5b237fa7f90e06.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/ArrowEntity.cpp (renamed from src/Entities/ProjectileArrow.cpp)36
1 files changed, 18 insertions, 18 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)
{
}