summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorLukas Pioch <lukas@zgow.de>2017-09-07 10:33:46 +0200
committerMattes D <github@xoft.cz>2017-09-07 10:33:46 +0200
commited7adef1ca277c0eaef3be840be6b9ee456c04b8 (patch)
treea207cddc5a097c86fc9aa1e1a6c762b8c5096c18 /src/Entities
parentChanged some int parameters to vector parameters (#3937) (diff)
downloadcuberite-ed7adef1ca277c0eaef3be840be6b9ee456c04b8.tar
cuberite-ed7adef1ca277c0eaef3be840be6b9ee456c04b8.tar.gz
cuberite-ed7adef1ca277c0eaef3be840be6b9ee456c04b8.tar.bz2
cuberite-ed7adef1ca277c0eaef3be840be6b9ee456c04b8.tar.lz
cuberite-ed7adef1ca277c0eaef3be840be6b9ee456c04b8.tar.xz
cuberite-ed7adef1ca277c0eaef3be840be6b9ee456c04b8.tar.zst
cuberite-ed7adef1ca277c0eaef3be840be6b9ee456c04b8.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Entity.h7
-rw-r--r--src/Entities/SplashPotionEntity.h5
2 files changed, 7 insertions, 5 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 7b934fb23..3dc2d8f42 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -217,7 +217,6 @@ public:
int GetChunkZ(void) const { return FloorC(m_Position.z / cChunkDef::Width); }
void SetHeadYaw (double a_HeadYaw);
- void SetHeight (double a_Height);
void SetMass (double a_Mass);
void SetPosX (double a_PosX) { SetPosition({a_PosX, m_Position.y, m_Position.z}); }
void SetPosY (double a_PosY) { SetPosition({m_Position.x, a_PosY, m_Position.z}); }
@@ -243,8 +242,6 @@ public:
/** Sets the speed in the Z axis, leaving the other speed components intact. Measured in m / sec. */
void SetSpeedZ(double a_SpeedZ);
- void SetWidth (double a_Width);
-
void AddPosX (double a_AddPosX) { AddPosition(a_AddPosX, 0, 0); }
void AddPosY (double a_AddPosY) { AddPosition(0, a_AddPosY, 0); }
void AddPosZ (double a_AddPosZ) { AddPosition(0, 0, a_AddPosZ); }
@@ -300,6 +297,10 @@ public:
// tolua_end
+ void SetHeight(double a_Height);
+
+ void SetWidth(double a_Width);
+
/** Exported in ManualBindings */
const Vector3d & GetPosition(void) const { return m_Position; }
diff --git a/src/Entities/SplashPotionEntity.h b/src/Entities/SplashPotionEntity.h
index fc364404b..bb78bfaeb 100644
--- a/src/Entities/SplashPotionEntity.h
+++ b/src/Entities/SplashPotionEntity.h
@@ -41,16 +41,17 @@ public:
// tolua_begin
cEntityEffect::eType GetEntityEffectType(void) const { return m_EntityEffectType; }
- cEntityEffect GetEntityEffect(void) const { return m_EntityEffect; }
int GetPotionColor(void) const { return m_PotionColor; }
const cItem & GetItem(void) const { return m_Item; }
void SetEntityEffectType(cEntityEffect::eType a_EntityEffectType) { m_EntityEffectType = a_EntityEffectType; }
- void SetEntityEffect(cEntityEffect a_EntityEffect) { m_EntityEffect = a_EntityEffect; }
void SetPotionColor(int a_PotionColor) { m_PotionColor = a_PotionColor; }
// tolua_end
+ cEntityEffect GetEntityEffect(void) const { return m_EntityEffect; }
+ void SetEntityEffect(cEntityEffect a_EntityEffect) { m_EntityEffect = a_EntityEffect; }
+
protected:
cEntityEffect::eType m_EntityEffectType;