summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/CMakeLists.txt8
-rw-r--r--src/Entities/ProjectileArrow.h3
-rw-r--r--src/Entities/ProjectileEgg.h6
-rw-r--r--src/Entities/ProjectileEnderPearl.h6
-rw-r--r--src/Entities/ProjectileExpBottle.h4
-rw-r--r--src/Entities/ProjectileFireCharge.h4
-rw-r--r--src/Entities/ProjectileFirework.h4
-rw-r--r--src/Entities/ProjectileGhastFireball.h4
-rw-r--r--src/Entities/ProjectileSnowball.h4
9 files changed, 24 insertions, 19 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9cc5fcb1e..2f433c29c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,6 +57,14 @@ if (NOT MSVC)
Entities/Pickup.h
Entities/Player.h
Entities/ProjectileEntity.h
+ Entities/ProjectileArrow.h
+ Entities/ProjectileEgg.h
+ Entities/ProjectileEnderPearl.h
+ Entities/ProjectileExpBottle.h
+ Entities/ProjectileSnowball.h
+ Entities/ProjectileFireCharge.h
+ Entities/ProjectileFirework.h
+ Entities/ProjectileGhastFireball.h
Entities/TNTEntity.h
Entities/ExpOrb.h
Entities/HangingEntity.h
diff --git a/src/Entities/ProjectileArrow.h b/src/Entities/ProjectileArrow.h
index c08b7acc5..8be0ecb7c 100644
--- a/src/Entities/ProjectileArrow.h
+++ b/src/Entities/ProjectileArrow.h
@@ -10,6 +10,8 @@
+// tolua_begin
+
class cArrowEntity :
public cProjectileEntity
{
@@ -91,5 +93,4 @@ protected:
virtual void CollectedBy(cPlayer * a_Player) override;
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
- // tolua_begin
}; \ No newline at end of file
diff --git a/src/Entities/ProjectileEgg.h b/src/Entities/ProjectileEgg.h
index 464526dfc..eac2650d0 100644
--- a/src/Entities/ProjectileEgg.h
+++ b/src/Entities/ProjectileEgg.h
@@ -10,6 +10,8 @@
+// tolua_begin
+
class cThrownEggEntity :
public cProjectileEntity
{
@@ -25,8 +27,6 @@ public:
protected:
- // tolua_end
-
// cProjectileEntity overrides:
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
@@ -34,6 +34,4 @@ protected:
// Randomly decides whether to spawn a chicken where the egg lands.
void TrySpawnChicken(const Vector3d & a_HitPos);
- // tolua_begin
-
} ; \ No newline at end of file
diff --git a/src/Entities/ProjectileEnderPearl.h b/src/Entities/ProjectileEnderPearl.h
index d6d052428..3ebf0fb3f 100644
--- a/src/Entities/ProjectileEnderPearl.h
+++ b/src/Entities/ProjectileEnderPearl.h
@@ -10,6 +10,8 @@
+// tolua_begin
+
class cThrownEnderPearlEntity :
public cProjectileEntity
{
@@ -25,8 +27,6 @@ public:
protected:
- // tolua_end
-
// cProjectileEntity overrides:
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
@@ -34,6 +34,4 @@ protected:
// Teleports the creator where the ender pearl lands.
void TeleportCreator(const Vector3d & a_HitPos);
- // tolua_begin
-
} ; \ No newline at end of file
diff --git a/src/Entities/ProjectileExpBottle.h b/src/Entities/ProjectileExpBottle.h
index 1f9482bf2..94843c51b 100644
--- a/src/Entities/ProjectileExpBottle.h
+++ b/src/Entities/ProjectileExpBottle.h
@@ -10,6 +10,8 @@
+// tolua_begin
+
class cExpBottleEntity :
public cProjectileEntity
{
@@ -28,6 +30,4 @@ protected:
// cProjectileEntity overrides:
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
- // tolua_begin
-
}; \ No newline at end of file
diff --git a/src/Entities/ProjectileFireCharge.h b/src/Entities/ProjectileFireCharge.h
index 6c088c547..ba556f228 100644
--- a/src/Entities/ProjectileFireCharge.h
+++ b/src/Entities/ProjectileFireCharge.h
@@ -10,6 +10,8 @@
+// tolua_begin
+
class cFireChargeEntity :
public cProjectileEntity
{
@@ -31,6 +33,4 @@ protected:
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
- // tolua_begin
-
} ; \ No newline at end of file
diff --git a/src/Entities/ProjectileFirework.h b/src/Entities/ProjectileFirework.h
index 74a50264b..fe90a44a1 100644
--- a/src/Entities/ProjectileFirework.h
+++ b/src/Entities/ProjectileFirework.h
@@ -10,6 +10,8 @@
+// tolua_begin
+
class cFireworkEntity :
public cProjectileEntity
{
@@ -35,6 +37,4 @@ private:
int m_ExplodeTimer;
cItem m_FireworkItem;
- // tolua_begin
-
}; \ No newline at end of file
diff --git a/src/Entities/ProjectileGhastFireball.h b/src/Entities/ProjectileGhastFireball.h
index 7aee1689a..f37eb42c9 100644
--- a/src/Entities/ProjectileGhastFireball.h
+++ b/src/Entities/ProjectileGhastFireball.h
@@ -10,6 +10,8 @@
+// tolua_begin
+
class cGhastFireballEntity :
public cProjectileEntity
{
@@ -33,6 +35,4 @@ protected:
// TODO: Deflecting the fireballs by arrow- or sword- hits
- // tolua_begin
-
} ; \ No newline at end of file
diff --git a/src/Entities/ProjectileSnowball.h b/src/Entities/ProjectileSnowball.h
index 5bc6f0daa..392bd8462 100644
--- a/src/Entities/ProjectileSnowball.h
+++ b/src/Entities/ProjectileSnowball.h
@@ -10,6 +10,8 @@
+// tolua_begin
+
class cThrownSnowballEntity :
public cProjectileEntity
{
@@ -29,6 +31,4 @@ protected:
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
- // tolua_begin
-
} ; \ No newline at end of file