summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorSamuel Barney <samjbarney@gmail.com>2014-08-25 21:16:49 +0200
committerSamuel Barney <samjbarney@gmail.com>2014-08-25 21:16:49 +0200
commit0e2df0fe496c83f9993863479da150b686087f0b (patch)
tree0d1540287fc27910a9831ad12c2a334d3a7b5340 /src/Entities
parentFixed some things from the mass replace. (diff)
downloadcuberite-0e2df0fe496c83f9993863479da150b686087f0b.tar
cuberite-0e2df0fe496c83f9993863479da150b686087f0b.tar.gz
cuberite-0e2df0fe496c83f9993863479da150b686087f0b.tar.bz2
cuberite-0e2df0fe496c83f9993863479da150b686087f0b.tar.lz
cuberite-0e2df0fe496c83f9993863479da150b686087f0b.tar.xz
cuberite-0e2df0fe496c83f9993863479da150b686087f0b.tar.zst
cuberite-0e2df0fe496c83f9993863479da150b686087f0b.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/Entity.h4
-rw-r--r--src/Entities/EntityEffect.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Entities/Entity.h b/src/Entities/Entity.h
index 3f3d369da..4754eb92c 100644
--- a/src/Entities/Entity.h
+++ b/src/Entities/Entity.h
@@ -371,7 +371,7 @@ public:
// tolua_end
- /** Descendants /*override*/ this function to send a command to the specified client to spawn the entity on the client.
+ /** Descendants override this function to send a command to the specified client to spawn the entity on the client.
To spawn on all eligible clients, use cChunkMap::BroadcastSpawnEntity()
*/
virtual void SpawnOn(cClientHandle & a_Client) = 0;
@@ -530,7 +530,7 @@ protected:
int m_TicksSinceLastVoidDamage;
/** Does the actual speed-setting. The default implementation just sets the member variable value;
- /*override*/s can provide further processing, such as forcing players to move at the given speed. */
+ overrides can provide further processing, such as forcing players to move at the given speed. */
virtual void DoSetSpeed(double a_SpeedX, double a_SpeedY, double a_SpeedZ);
virtual void Destroyed(void) {} // Called after the entity has been destroyed
diff --git a/src/Entities/EntityEffect.h b/src/Entities/EntityEffect.h
index 2667d1602..4ce155f4a 100644
--- a/src/Entities/EntityEffect.h
+++ b/src/Entities/EntityEffect.h
@@ -101,7 +101,7 @@ public:
void SetDistanceModifier(double a_DistanceModifier) { m_DistanceModifier = a_DistanceModifier; }
/** Called on each tick.
- By default increases the m_Ticks, descendants may /*override*/ to provide additional processing. */
+ By default increases the m_Ticks, descendants may override to provide additional processing. */
virtual void OnTick(cPawn & a_Target);
/** Called when the effect is first added to an entity */