summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorTycho Bickerstaff <work.tycho@gmail.com>2013-12-21 16:00:31 +0100
committerTycho Bickerstaff <work.tycho@gmail.com>2013-12-21 16:00:31 +0100
commit38f808ac3d09cbb5bf437243f4b050e196fa582c (patch)
tree7f2be78caedb090c709bd28d96c9fd851bcab592 /src/Entities
parentadded FORCE_32 option (diff)
downloadcuberite-38f808ac3d09cbb5bf437243f4b050e196fa582c.tar
cuberite-38f808ac3d09cbb5bf437243f4b050e196fa582c.tar.gz
cuberite-38f808ac3d09cbb5bf437243f4b050e196fa582c.tar.bz2
cuberite-38f808ac3d09cbb5bf437243f4b050e196fa582c.tar.lz
cuberite-38f808ac3d09cbb5bf437243f4b050e196fa582c.tar.xz
cuberite-38f808ac3d09cbb5bf437243f4b050e196fa582c.tar.zst
cuberite-38f808ac3d09cbb5bf437243f4b050e196fa582c.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Entity.h8
-rw-r--r--src/Entities/ProjectileEntity.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 9cb36eb14..0d7634f73 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -351,10 +351,10 @@ public:
// tolua_end
/// Called when the specified player right-clicks this entity
- virtual void OnRightClicked(cPlayer & a_Player) {};
+ virtual void OnRightClicked(cPlayer &) {};
/// Returns the list of drops for this pawn when it is killed. May check a_Killer for special handling (sword of looting etc.). Called from KilledBy().
- virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) {}
+ virtual void GetDrops(cItems & /*a_Drops*/, cEntity * /*a_Killer*/ = NULL) {}
protected:
static cCriticalSection m_CSCount;
@@ -420,11 +420,11 @@ protected:
void Dereference( cEntity*& a_EntityPtr );
private:
- // Measured in degrees (MAX 360°)
+ // Measured in degrees (MAX 360°)
double m_HeadYaw;
// Measured in meter/second (m/s)
Vector3d m_Speed;
- // Measured in degrees (MAX 360°)
+ // Measured in degrees (MAX 360°)
Vector3d m_Rot;
/// Position of the entity's XZ center and Y bottom
diff --git a/src/Entities/ProjectileEntity.h b/src/Entities/ProjectileEntity.h
index 959e81ae5..e9e377fe0 100644
--- a/src/Entities/ProjectileEntity.h
+++ b/src/Entities/ProjectileEntity.h
@@ -52,7 +52,7 @@ public:
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, char a_HitFace);
/// Called by the physics blocktracer when the entity hits another entity
- virtual void OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos) {}
+ virtual void OnHitEntity(cEntity & /*a_EntityHit*/, const Vector3d & /*a_HitPos*/) {}
/// Called by Chunk when the projectile is eligible for player collection
virtual void CollectedBy(cPlayer * a_Dest);