summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/Entities/ProjectileEntity.cpp72
-rw-r--r--src/Entities/ProjectileEntity.h45
-rw-r--r--src/Entities/ProjectileFirework.cpp73
-rw-r--r--src/Entities/ProjectileFirework.h40
-rw-r--r--src/Protocol/Protocol17x.cpp1
5 files changed, 116 insertions, 115 deletions
diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp
index 3a5ac059b..4784d4b0c 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 "ProjectileFirework.h"
#include "ProjectileGhastFireball.h"
@@ -408,75 +409,4 @@ void cProjectileEntity::CollectedBy(cPlayer * a_Dest)
{
// Overriden in arrow
UNUSED(a_Dest);
-}
-
-
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// cFireworkEntity :
-
-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)
-{
-}
-
-
-
-
-
-void cFireworkEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
-{
- int RelX = POSX_TOINT - a_Chunk.GetPosX() * cChunkDef::Width;
- int RelZ = POSZ_TOINT - a_Chunk.GetPosZ() * cChunkDef::Width;
- int PosY = POSY_TOINT;
-
- if ((PosY < 0) || (PosY >= cChunkDef::Height))
- {
- goto setspeed;
- }
-
- if (m_IsInGround)
- {
- if (a_Chunk.GetBlock(RelX, POSY_TOINT + 1, RelZ) == E_BLOCK_AIR)
- {
- m_IsInGround = false;
- }
- else
- {
- return;
- }
- }
- else
- {
- if (a_Chunk.GetBlock(RelX, POSY_TOINT + 1, RelZ) != E_BLOCK_AIR)
- {
- OnHitSolidBlock(GetPosition(), BLOCK_FACE_YM);
- return;
- }
- }
-
-setspeed:
- AddSpeedY(1);
- AddPosition(GetSpeed() * (a_Dt / 1000));
-}
-
-
-
-
-
-void cFireworkEntity::Tick(float a_Dt, cChunk & a_Chunk)
-{
- super::Tick(a_Dt, a_Chunk);
-
- if (m_ExplodeTimer == m_FireworkItem.m_FireworkItem.m_FlightTimeInTicks)
- {
- m_World->BroadcastEntityStatus(*this, esFireworkExploding);
- Destroy();
- }
-
- m_ExplodeTimer++;
} \ No newline at end of file
diff --git a/src/Entities/ProjectileEntity.h b/src/Entities/ProjectileEntity.h
index c9b1588ef..e98652206 100644
--- a/src/Entities/ProjectileEntity.h
+++ b/src/Entities/ProjectileEntity.h
@@ -94,47 +94,4 @@ protected:
virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override;
virtual void SpawnOn(cClientHandle & a_Client) 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, const cItem & a_Item);
- const cItem & GetItem(void) const { return m_FireworkItem; }
-
-protected:
-
- // cProjectileEntity overrides:
- virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override;
- virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
-
-private:
-
- int m_ExplodeTimer;
- cItem m_FireworkItem;
-
- // tolua_begin
-
-};
-
-
-
-
-
-// tolua_end
-
-
-
+} ; \ No newline at end of file
diff --git a/src/Entities/ProjectileFirework.cpp b/src/Entities/ProjectileFirework.cpp
new file mode 100644
index 000000000..e884361c4
--- /dev/null
+++ b/src/Entities/ProjectileFirework.cpp
@@ -0,0 +1,73 @@
+#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
+
+#include "ProjectileFirework.h"
+#include "../World.h"
+#include "../Chunk.h"
+
+
+
+
+
+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)
+{
+}
+
+
+
+
+
+void cFireworkEntity::HandlePhysics(float a_Dt, cChunk & a_Chunk)
+{
+ int RelX = POSX_TOINT - a_Chunk.GetPosX() * cChunkDef::Width;
+ int RelZ = POSZ_TOINT - a_Chunk.GetPosZ() * cChunkDef::Width;
+ int PosY = POSY_TOINT;
+
+ if ((PosY < 0) || (PosY >= cChunkDef::Height))
+ {
+ goto setspeed;
+ }
+
+ if (m_IsInGround)
+ {
+ if (a_Chunk.GetBlock(RelX, POSY_TOINT + 1, RelZ) == E_BLOCK_AIR)
+ {
+ m_IsInGround = false;
+ }
+ else
+ {
+ return;
+ }
+ }
+ else
+ {
+ if (a_Chunk.GetBlock(RelX, POSY_TOINT + 1, RelZ) != E_BLOCK_AIR)
+ {
+ OnHitSolidBlock(GetPosition(), BLOCK_FACE_YM);
+ return;
+ }
+ }
+
+setspeed:
+ AddSpeedY(1);
+ AddPosition(GetSpeed() * (a_Dt / 1000));
+}
+
+
+
+
+
+void cFireworkEntity::Tick(float a_Dt, cChunk & a_Chunk)
+{
+ super::Tick(a_Dt, a_Chunk);
+
+ if (m_ExplodeTimer == m_FireworkItem.m_FireworkItem.m_FlightTimeInTicks)
+ {
+ m_World->BroadcastEntityStatus(*this, esFireworkExploding);
+ Destroy();
+ }
+
+ m_ExplodeTimer++;
+} \ No newline at end of file
diff --git a/src/Entities/ProjectileFirework.h b/src/Entities/ProjectileFirework.h
new file mode 100644
index 000000000..74a50264b
--- /dev/null
+++ b/src/Entities/ProjectileFirework.h
@@ -0,0 +1,40 @@
+//
+// ProjectileFirework.h
+//
+
+#pragma once
+
+#include "ProjectileEntity.h"
+
+
+
+
+
+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, const cItem & a_Item);
+ const cItem & GetItem(void) const { return m_FireworkItem; }
+
+protected:
+
+ // cProjectileEntity overrides:
+ virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override;
+ virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+
+private:
+
+ int m_ExplodeTimer;
+ cItem m_FireworkItem;
+
+ // tolua_begin
+
+}; \ No newline at end of file
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index 4f2fb7158..468c4cf2b 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -32,6 +32,7 @@ Implements the 1.7.x protocol classes:
#include "../BlockEntities/FlowerPotEntity.h"
#include "../CompositeChat.h"
#include "../Entities/ProjectileArrow.h"
+#include "../Entities/ProjectileFirework.h"