diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CommandOutput.h | 2 | ||||
| -rw-r--r-- | src/CompositeChat.h | 2 | ||||
| -rw-r--r-- | src/Entities/Entity.h | 4 | ||||
| -rw-r--r-- | src/Entities/EntityEffect.h | 2 | ||||
| -rw-r--r-- | src/Generating/GridStructGen.h | 4 | ||||
| -rw-r--r-- | src/Protocol/Authenticator.h | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/CommandOutput.h b/src/CommandOutput.h index 0fc1a370a..391d5a868 100644 --- a/src/CommandOutput.h +++ b/src/CommandOutput.h @@ -9,7 +9,7 @@ /** Interface for a callback that receives command output The Out() function is called for any output the command has produced. -Descendants /*override*/ that function to provide specific processing of the output. +Descendants override that function to provide specific processing of the output. */ class cCommandOutputCallback { diff --git a/src/CompositeChat.h b/src/CompositeChat.h index 90a6bc4c1..2dc21b98f 100644 --- a/src/CompositeChat.h +++ b/src/CompositeChat.h @@ -210,7 +210,7 @@ protected: /** Adds a_AddStyle to a_Style; overwrites the existing style if appropriate. - If the style already contains something that a_AddStyle /*override*/s, it is erased first. */ + If the style already contains something that a_AddStyle overrides, it is erased first. */ void AddStyle(AString & a_Style, const AString & a_AddStyle); } ; // tolua_export 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 */ diff --git a/src/Generating/GridStructGen.h b/src/Generating/GridStructGen.h index 04ae2db98..e731319f0 100644 --- a/src/Generating/GridStructGen.h +++ b/src/Generating/GridStructGen.h @@ -27,7 +27,7 @@ Each structure thus contains the coords of its grid center (m_GridX, m_GridZ) an which it's built (m_OriginX, m_OriginZ). This class provides a cache for the structures generated for successive chunks and manages that cache. It -also provides the cFinishGen /*override*/ that uses the cache to actually generate the structure into chunk data. +also provides the cFinishGen override that uses the cache to actually generate the structure into chunk data. After generating each chunk the cache is checked for size, each item in the cache has a cost associated with it and the cache is trimmed (from its least-recently-used end) so that the sum of the cost in the cache is @@ -39,7 +39,7 @@ a structure at the specific grid cell. The descendant must use a specific cStructure descendant to provide the actual structure that gets generated. The structure must provide the DrawIntoChunk() function that generates the structure into the chunk data, and -can /*override*/ the GetCacheCost() function that returns the cost of that structure in the cache. +can override the GetCacheCost() function that returns the cost of that structure in the cache. */ class cGridStructGen : public cFinishGen diff --git a/src/Protocol/Authenticator.h b/src/Protocol/Authenticator.h index 777bcda6a..b3bae5417 100644 --- a/src/Protocol/Authenticator.h +++ b/src/Protocol/Authenticator.h @@ -86,7 +86,7 @@ private: AString m_PropertiesAddress; bool m_ShouldAuthenticate; - /** cIsThread /*override*/: */ + /** cIsThread override: */ virtual void Execute(void) /*override*/; /** Returns true if the user authenticated okay, false on error |