summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-04-27 18:42:31 +0200
committerarchshift <admin@archshift.com>2014-04-27 18:42:31 +0200
commit15324f3bbdaf7529636cc1930e1c1b87ef911d86 (patch)
tree4030ee1315e1c6f6e498713e11f3e56b985aeeac /src
parentFixed ToLua issues (diff)
downloadcuberite-15324f3bbdaf7529636cc1930e1c1b87ef911d86.tar
cuberite-15324f3bbdaf7529636cc1930e1c1b87ef911d86.tar.gz
cuberite-15324f3bbdaf7529636cc1930e1c1b87ef911d86.tar.bz2
cuberite-15324f3bbdaf7529636cc1930e1c1b87ef911d86.tar.lz
cuberite-15324f3bbdaf7529636cc1930e1c1b87ef911d86.tar.xz
cuberite-15324f3bbdaf7529636cc1930e1c1b87ef911d86.tar.zst
cuberite-15324f3bbdaf7529636cc1930e1c1b87ef911d86.zip
Diffstat (limited to 'src')
-rw-r--r--src/Entities/ProjectileArrow.cpp2
-rw-r--r--src/Entities/ProjectileArrow.h2
-rw-r--r--src/Entities/ProjectileEgg.cpp2
-rw-r--r--src/Entities/ProjectileEgg.h2
-rw-r--r--src/Entities/ProjectileEnderPearl.cpp2
-rw-r--r--src/Entities/ProjectileEnderPearl.h2
-rw-r--r--src/Entities/ProjectileEntity.cpp2
-rw-r--r--src/Entities/ProjectileEntity.h2
-rw-r--r--src/Entities/ProjectileExpBottle.cpp2
-rw-r--r--src/Entities/ProjectileExpBottle.h2
-rw-r--r--src/Entities/ProjectileFireCharge.cpp2
-rw-r--r--src/Entities/ProjectileFireCharge.h2
-rw-r--r--src/Entities/ProjectileFirework.cpp2
-rw-r--r--src/Entities/ProjectileFirework.h2
-rw-r--r--src/Entities/ProjectileGhastFireball.cpp2
-rw-r--r--src/Entities/ProjectileGhastFireball.h2
-rw-r--r--src/Entities/ProjectileSnowball.cpp2
-rw-r--r--src/Entities/ProjectileSnowball.h4
18 files changed, 19 insertions, 19 deletions
diff --git a/src/Entities/ProjectileArrow.cpp b/src/Entities/ProjectileArrow.cpp
index bd4f2abab..8bf680797 100644
--- a/src/Entities/ProjectileArrow.cpp
+++ b/src/Entities/ProjectileArrow.cpp
@@ -190,4 +190,4 @@ void cArrowEntity::Tick(float a_Dt, cChunk & a_Chunk)
m_IsInGround = false; // Yes, begin simulating physics again
}
}
-} \ No newline at end of file
+}
diff --git a/src/Entities/ProjectileArrow.h b/src/Entities/ProjectileArrow.h
index 8be0ecb7c..18c30feae 100644
--- a/src/Entities/ProjectileArrow.h
+++ b/src/Entities/ProjectileArrow.h
@@ -93,4 +93,4 @@ protected:
virtual void CollectedBy(cPlayer * a_Player) override;
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
-}; \ No newline at end of file
+}; // tolua_export
diff --git a/src/Entities/ProjectileEgg.cpp b/src/Entities/ProjectileEgg.cpp
index 61d61e1c6..3f6e6525e 100644
--- a/src/Entities/ProjectileEgg.cpp
+++ b/src/Entities/ProjectileEgg.cpp
@@ -56,4 +56,4 @@ void cThrownEggEntity::TrySpawnChicken(const Vector3d & a_HitPos)
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
m_World->SpawnMob(a_HitPos.x, a_HitPos.y, a_HitPos.z, cMonster::mtChicken);
}
-} \ No newline at end of file
+}
diff --git a/src/Entities/ProjectileEgg.h b/src/Entities/ProjectileEgg.h
index eac2650d0..ba1f6420e 100644
--- a/src/Entities/ProjectileEgg.h
+++ b/src/Entities/ProjectileEgg.h
@@ -34,4 +34,4 @@ protected:
// Randomly decides whether to spawn a chicken where the egg lands.
void TrySpawnChicken(const Vector3d & a_HitPos);
-} ; \ No newline at end of file
+} ; // tolua_export
diff --git a/src/Entities/ProjectileEnderPearl.cpp b/src/Entities/ProjectileEnderPearl.cpp
index 4e848f189..db32f47b7 100644
--- a/src/Entities/ProjectileEnderPearl.cpp
+++ b/src/Entities/ProjectileEnderPearl.cpp
@@ -51,4 +51,4 @@ void cThrownEnderPearlEntity::TeleportCreator(const Vector3d & a_HitPos)
m_Creator->TeleportToCoords(a_HitPos.x + 0.5, a_HitPos.y + 1.7, a_HitPos.z + 0.5);
m_Creator->TakeDamage(dtEnderPearl, this, 5, 0);
}
-} \ No newline at end of file
+}
diff --git a/src/Entities/ProjectileEnderPearl.h b/src/Entities/ProjectileEnderPearl.h
index 3ebf0fb3f..39761ff48 100644
--- a/src/Entities/ProjectileEnderPearl.h
+++ b/src/Entities/ProjectileEnderPearl.h
@@ -34,4 +34,4 @@ protected:
// Teleports the creator where the ender pearl lands.
void TeleportCreator(const Vector3d & a_HitPos);
-} ; \ No newline at end of file
+} ; // tolua_export
diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp
index 4784d4b0c..b2e6d469e 100644
--- a/src/Entities/ProjectileEntity.cpp
+++ b/src/Entities/ProjectileEntity.cpp
@@ -409,4 +409,4 @@ void cProjectileEntity::CollectedBy(cPlayer * a_Dest)
{
// Overriden in arrow
UNUSED(a_Dest);
-} \ No newline at end of file
+}
diff --git a/src/Entities/ProjectileEntity.h b/src/Entities/ProjectileEntity.h
index e98652206..ae06b072f 100644
--- a/src/Entities/ProjectileEntity.h
+++ b/src/Entities/ProjectileEntity.h
@@ -94,4 +94,4 @@ protected:
virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override;
virtual void SpawnOn(cClientHandle & a_Client) override;
-} ; \ No newline at end of file
+} ; // tolua_export
diff --git a/src/Entities/ProjectileExpBottle.cpp b/src/Entities/ProjectileExpBottle.cpp
index 3af2b4a4a..936be6a72 100644
--- a/src/Entities/ProjectileExpBottle.cpp
+++ b/src/Entities/ProjectileExpBottle.cpp
@@ -24,4 +24,4 @@ void cExpBottleEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_H
m_World->SpawnExperienceOrb(GetPosX(), GetPosY(), GetPosZ(), 3 + m_World->GetTickRandomNumber(8));
Destroy();
-} \ No newline at end of file
+}
diff --git a/src/Entities/ProjectileExpBottle.h b/src/Entities/ProjectileExpBottle.h
index 94843c51b..070c412e4 100644
--- a/src/Entities/ProjectileExpBottle.h
+++ b/src/Entities/ProjectileExpBottle.h
@@ -30,4 +30,4 @@ protected:
// cProjectileEntity overrides:
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
-}; \ No newline at end of file
+}; // tolua_export
diff --git a/src/Entities/ProjectileFireCharge.cpp b/src/Entities/ProjectileFireCharge.cpp
index 38ba95724..5bdb74462 100644
--- a/src/Entities/ProjectileFireCharge.cpp
+++ b/src/Entities/ProjectileFireCharge.cpp
@@ -47,4 +47,4 @@ void cFireChargeEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_Hi
// TODO: Some entities are immune to hits
a_EntityHit.StartBurning(5 * 20); // 5 seconds of burning
-} \ No newline at end of file
+}
diff --git a/src/Entities/ProjectileFireCharge.h b/src/Entities/ProjectileFireCharge.h
index ba556f228..bcf2b7af6 100644
--- a/src/Entities/ProjectileFireCharge.h
+++ b/src/Entities/ProjectileFireCharge.h
@@ -33,4 +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;
-} ; \ No newline at end of file
+} ; // tolua_export
diff --git a/src/Entities/ProjectileFirework.cpp b/src/Entities/ProjectileFirework.cpp
index e884361c4..dcb89fce3 100644
--- a/src/Entities/ProjectileFirework.cpp
+++ b/src/Entities/ProjectileFirework.cpp
@@ -70,4 +70,4 @@ void cFireworkEntity::Tick(float a_Dt, cChunk & a_Chunk)
}
m_ExplodeTimer++;
-} \ No newline at end of file
+}
diff --git a/src/Entities/ProjectileFirework.h b/src/Entities/ProjectileFirework.h
index fe90a44a1..e7d7eacbf 100644
--- a/src/Entities/ProjectileFirework.h
+++ b/src/Entities/ProjectileFirework.h
@@ -37,4 +37,4 @@ private:
int m_ExplodeTimer;
cItem m_FireworkItem;
-}; \ No newline at end of file
+}; // tolua_export
diff --git a/src/Entities/ProjectileGhastFireball.cpp b/src/Entities/ProjectileGhastFireball.cpp
index b8325aea2..cac622562 100644
--- a/src/Entities/ProjectileGhastFireball.cpp
+++ b/src/Entities/ProjectileGhastFireball.cpp
@@ -41,4 +41,4 @@ void cGhastFireballEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a
{
Destroy();
Explode((int)floor(a_HitPos.x), (int)floor(a_HitPos.y), (int)floor(a_HitPos.z));
-} \ No newline at end of file
+}
diff --git a/src/Entities/ProjectileGhastFireball.h b/src/Entities/ProjectileGhastFireball.h
index f37eb42c9..6dd37783e 100644
--- a/src/Entities/ProjectileGhastFireball.h
+++ b/src/Entities/ProjectileGhastFireball.h
@@ -35,4 +35,4 @@ protected:
// TODO: Deflecting the fireballs by arrow- or sword- hits
-} ; \ No newline at end of file
+} ; // tolua_export
diff --git a/src/Entities/ProjectileSnowball.cpp b/src/Entities/ProjectileSnowball.cpp
index bc056d289..536b9e791 100644
--- a/src/Entities/ProjectileSnowball.cpp
+++ b/src/Entities/ProjectileSnowball.cpp
@@ -45,4 +45,4 @@ void cThrownSnowballEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d &
a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1);
Destroy(true);
-} \ No newline at end of file
+}
diff --git a/src/Entities/ProjectileSnowball.h b/src/Entities/ProjectileSnowball.h
index 392bd8462..2443d05c6 100644
--- a/src/Entities/ProjectileSnowball.h
+++ b/src/Entities/ProjectileSnowball.h
@@ -1,5 +1,5 @@
//
-// ProjectileEgg.h
+// ProjectileSnowball.h
//
#pragma once
@@ -31,4 +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;
-} ; \ No newline at end of file
+} ; // tolua_export