East const.

ratkosrb · ratkosrb · commit 8e60b37b3ab9 · 2025-02-14T17:28:08.000+02:00
diff --git a/contrib/mmap/src/MapBuilder.cpp b/contrib/mmap/src/MapBuilder.cpp
@@ -36,7 +36,7 @@ namespace MMAP
                            bool skipBattlegrounds,
                            bool debug,
                            bool quick,
-                           const char* offMeshFilePath,
+                           char const* offMeshFilePath,
                            uint8 threads) :
         m_terrainBuilder(nullptr),
         m_debug(debug),
diff --git a/contrib/mmap/src/TerrainBuilder.cpp b/contrib/mmap/src/TerrainBuilder.cpp
@@ -995,7 +995,7 @@ namespace MMAP
     }
 
     /**************************************************************************/
-    void TerrainBuilder::loadOffMeshConnections(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, const char* offMeshFilePath)
+    void TerrainBuilder::loadOffMeshConnections(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, char const* offMeshFilePath)
     {
         // no meshfile input given?
         if (offMeshFilePath == nullptr)
diff --git a/contrib/mmap/src/generator.cpp b/contrib/mmap/src/generator.cpp
@@ -111,8 +111,8 @@ bool handleArgs(int argc, char** argv,
                 bool& silent,
                 bool& quick,
                 bool& buildOnlyGameobjectModels,
-                const char*& offMeshInputPath,
-                const char*& configInputPath,
+                char const*& offMeshInputPath,
+                char const*& configInputPath,
                 int& threads)
 {
     char* param = nullptr;
@@ -217,7 +217,7 @@ bool handleArgs(int argc, char** argv,
     return true;
 }
 
-int finish(const char* message, int returnValue)
+int finish(char const* message, int returnValue)
 {
     printf("%s", message);
     getchar();
@@ -240,8 +240,8 @@ int main(int argc, char** argv)
     bool quick = false;
     int threads = 0;
 
-    const char* offMeshInputPath = "offmesh.txt";
-    const char* configInputPath = "config.json";
+    char const* offMeshInputPath = "offmesh.txt";
+    char const* configInputPath = "config.json";
 
     bool validParam = handleArgs(argc, argv, mapId, tileX, tileY, skipLiquid, skipContinents, skipJunkMaps, skipBattlegrounds, debug, silent, quick, buildOnlyGameobjectModels, offMeshInputPath, configInputPath, threads);
 
diff --git a/src/framework/GameSystem/NGrid.h b/src/framework/GameSystem/NGrid.h
@@ -109,8 +109,8 @@ class NGrid
             return i_cells[x][y];
         }
 
-        const uint32& GetGridId() const { return i_gridId; }
-        void SetGridId(const uint32 id) { i_gridId = id; }
+        uint32 const& GetGridId() const { return i_gridId; }
+        void SetGridId(uint32 const id) { i_gridId = id; }
         grid_state_t GetGridState() const { return i_cellstate; }
         void SetGridState(grid_state_t s) { i_cellstate = s; }
         uint32 getX() const { return i_x; }
@@ -134,13 +134,13 @@ class NGrid
         void UpdateTimeTracker(time_t diff) { i_GridInfo.UpdateTimeTracker(diff); }
 
         template<class SPECIFIC_OBJECT>
-        void AddWorldObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj)
+        void AddWorldObject(uint32 const x, uint32 const y, SPECIFIC_OBJECT *obj)
         {
             getGridType(x, y).AddWorldObject(obj);
         }
 
         template<class SPECIFIC_OBJECT>
-        void RemoveWorldObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj)
+        void RemoveWorldObject(uint32 const x, uint32 const y, SPECIFIC_OBJECT *obj)
         {
             getGridType(x, y).RemoveWorldObject(obj);
         }
@@ -154,7 +154,7 @@ class NGrid
         }
 
         template<class T, class TT>
-        void Visit(const uint32 &x, const uint32 &y, TypeContainerVisitor<T, TypeMapContainer<TT> > &visitor)
+        void Visit(uint32 const &x, uint32 const &y, TypeContainerVisitor<T, TypeMapContainer<TT> > &visitor)
         {
             getGridType(x, y).Visit(visitor);
         }
@@ -170,20 +170,20 @@ class NGrid
         }
 
         template<class SPECIFIC_OBJECT>
-        bool AddGridObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj)
+        bool AddGridObject(uint32 const x, uint32 const y, SPECIFIC_OBJECT *obj)
         {
             return getGridType(x, y).AddGridObject(obj);
         }
 
         template<class SPECIFIC_OBJECT>
-        bool RemoveGridObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj)
+        bool RemoveGridObject(uint32 const x, uint32 const y, SPECIFIC_OBJECT *obj)
         {
             return getGridType(x, y).RemoveGridObject(obj);
         }
 
     private:
 
-        GridType& getGridType(const uint32& x, const uint32& y)
+        GridType& getGridType(uint32 const& x, uint32 const& y)
         {
             assert(x < N);
             assert(y < N);
diff --git a/src/game/Anticheat/MovementAnticheat/MovementAnticheat.cpp b/src/game/Anticheat/MovementAnticheat/MovementAnticheat.cpp
@@ -16,7 +16,7 @@
 
 using namespace Geometry;
 
-const char* GetMovementCheatName(CheatType flagId)
+char const* GetMovementCheatName(CheatType flagId)
 {
     switch (flagId)
     {
diff --git a/src/game/Anticheat/MovementAnticheat/MovementAnticheat.h b/src/game/Anticheat/MovementAnticheat/MovementAnticheat.h
@@ -56,7 +56,7 @@ enum CheatType
 };
 
 #define CHEATS_UPDATE_INTERVAL      4000
-const char* GetMovementCheatName(CheatType type);
+char const* GetMovementCheatName(CheatType type);
 
 class Player;
 class MovementInfo;
diff --git a/src/game/Chat/Chat.cpp b/src/game/Chat/Chat.cpp
@@ -1411,7 +1411,7 @@ void ChatHandler::LoadRbacPermissions()
     }
 }
 
-bool ChatHandler::SetPermissionMaskForCommandInTable(ChatCommand* commandTable, const char* text, uint32 permissionId)
+bool ChatHandler::SetPermissionMaskForCommandInTable(ChatCommand* commandTable, char const* text, uint32 permissionId)
 {
     std::string fullcommand = text;                         // original `text` can't be used. It content destroyed in command code processing.
 
diff --git a/src/game/Chat/Chat.h b/src/game/Chat/Chat.h
@@ -178,8 +178,8 @@ class ChatHandler
 
         void SendGlobalSysMessage(char const* str);
 
-        static bool SetPermissionMaskForCommandInTable(ChatCommand* table, const char* text, uint32 permissionId);
-        static bool SetDataForCommandInTable(ChatCommand *table, const char* text, uint8 security, std::string const& help, uint8 flags);
+        static bool SetPermissionMaskForCommandInTable(ChatCommand* table, char const* text, uint32 permissionId);
+        static bool SetDataForCommandInTable(ChatCommand *table, char const* text, uint8 security, std::string const& help, uint8 flags);
         void ExecuteCommand(char const* text);
         bool ShowHelpForCommand(ChatCommand *table, char const* cmd);
         bool ShowHelpForSubCommands(ChatCommand *table, char const* cmd);
diff --git a/src/game/Objects/MirrorTimer.cpp b/src/game/Objects/MirrorTimer.cpp
@@ -116,8 +116,8 @@ bool MirrorTimer::Update(uint32 diff)
         if (!m_tracker.Passed())
             return true;
 
-        const uint32 interval = m_tracker.GetInterval();
-        const uint32 overflow = (m_tracker.GetCurrent() - interval);
+        uint32 const interval = m_tracker.GetInterval();
+        uint32 const overflow = (m_tracker.GetCurrent() - interval);
 
         m_tracker.SetCurrent(interval);
 
@@ -135,7 +135,7 @@ bool MirrorTimer::Update(uint32 diff)
     }
     else                // Timer regenerating
     {
-        const uint32 current = m_tracker.GetCurrent();
+        uint32 const current = m_tracker.GetCurrent();
 
         if (current > diff)
         {
diff --git a/src/game/Objects/Object.cpp b/src/game/Objects/Object.cpp
@@ -1564,7 +1564,7 @@ float WorldObject::GetSizeFactorForDistance(WorldObject const* obj, SizeFactor d
     return sizefactor;
 }
 
-float WorldObject::GetDistance(const WorldObject* obj, SizeFactor distcalc) const
+float WorldObject::GetDistance(WorldObject const* obj, SizeFactor distcalc) const
 {
     ASSERT(obj);
     float dx = GetPositionX() - obj->GetPositionX();
@@ -1644,7 +1644,7 @@ bool WorldObject::IsInMap(WorldObject const* obj) const
     return IsInWorld() && obj->IsInWorld() && (FindMap() == obj->FindMap());
 }
 
-bool WorldObject::_IsWithinDist(WorldObject const* obj, float const dist2compare, const bool is3D, SizeFactor distcalc) const
+bool WorldObject::_IsWithinDist(WorldObject const* obj, float const dist2compare, bool const is3D, SizeFactor distcalc) const
 {
     ASSERT(obj);
     float const dx = GetPositionX() - obj->GetPositionX();
diff --git a/src/game/Objects/Object.h b/src/game/Objects/Object.h
@@ -585,14 +585,14 @@ class WorldObject : public Object
         template <class T >
         bool IsWithinDist2d(T const& position, float dist2compare, SizeFactor distcalc = SizeFactor::BoundingRadius) const { return IsWithinDist2d(position.x, position.y, dist2compare, distcalc); }
         bool IsWithinDist2d(float x, float y, float dist2compare, SizeFactor distcalc = SizeFactor::BoundingRadius) const;
-        bool _IsWithinDist(WorldObject const* obj, float const dist2compare, const bool is3D, SizeFactor distcalc = SizeFactor::BoundingRadius) const;
+        bool _IsWithinDist(WorldObject const* obj, float const dist2compare, bool const is3D, SizeFactor distcalc = SizeFactor::BoundingRadius) const;
 
         // use only if you will sure about placing both object at same map
-        bool IsWithinDist(WorldObject const* obj, float const& dist2compare, const bool is3D = true, SizeFactor distcalc = SizeFactor::BoundingRadius) const
+        bool IsWithinDist(WorldObject const* obj, float const& dist2compare, bool const is3D = true, SizeFactor distcalc = SizeFactor::BoundingRadius) const
         {
             return obj && _IsWithinDist(obj, dist2compare, is3D, distcalc);
         }
-        bool IsWithinDistInMap(WorldObject const* obj, float const& dist2compare, const bool is3D = true, SizeFactor distcalc = SizeFactor::BoundingRadius) const
+        bool IsWithinDistInMap(WorldObject const* obj, float const& dist2compare, bool const is3D = true, SizeFactor distcalc = SizeFactor::BoundingRadius) const
         {
             return obj && IsInMap(obj) && _IsWithinDist(obj, dist2compare, is3D, distcalc);
         }
diff --git a/src/game/Objects/Player.cpp b/src/game/Objects/Player.cpp
@@ -813,7 +813,7 @@ void Player::SetWaterBreathingIntervalMultiplier(float multiplier)
 
     m_environmentBreathingMultiplier = multiplier;
 
-    if (const uint32 interval = GetWaterBreathingInterval())
+    if (uint32 const interval = GetWaterBreathingInterval())
     {
         m_mirrorTimers[MirrorTimer::BREATH].SetDuration(interval);
         m_mirrorTimers[MirrorTimer::BREATH].SetScale(IsUnderwater() ? -1 : 10);
@@ -937,8 +937,8 @@ void Player::UpdateMirrorTimers(uint32 diff, bool send/* = true*/)
 {
     for (auto& timer : m_mirrorTimers)
     {
-        const MirrorTimer::Type type = timer.GetType();
-        const bool active = timer.IsActive();
+        MirrorTimer::Type const type = timer.GetType();
+        bool const active = timer.IsActive();
 
         if (active || CheckMirrorTimerActivation(type))
         {
diff --git a/src/game/Objects/UpdateFields.h b/src/game/Objects/UpdateFields.h
@@ -136,10 +136,10 @@ enum UpdateFieldFlags : uint16
 struct UpdateFieldData
 {
     UpdateFieldData() = default;
-    UpdateFieldData(uint8 objectTypeMask_, const char* name_, uint16 offset_, uint16 size_, UpdateFieldValueTypes valueType_, uint16 flags_) :
+    UpdateFieldData(uint8 objectTypeMask_, char const* name_, uint16 offset_, uint16 size_, UpdateFieldValueTypes valueType_, uint16 flags_) :
         objectTypeMask(objectTypeMask_), name(name_), offset(offset_), size(size_), valueType(valueType_), flags(flags_) {}
     uint8 objectTypeMask = 0;
-    const char* name = "";
+    char const* name = "";
     uint16 offset = 0;
     uint16 size = 0;
     UpdateFieldValueTypes valueType = UF_TYPE_NONE;
diff --git a/src/game/Transports/Transport.cpp b/src/game/Transports/Transport.cpp
@@ -285,7 +285,7 @@ void Transport::Update(uint32 /*update_diff*/, uint32 /*time_diff*/)
     if (m_pathProgress >= currentMsTime) // map transition and update happened in same tick due to MT
         return;
 
-    const uint32 diff = currentMsTime - m_pathProgress;
+    uint32 const diff = currentMsTime - m_pathProgress;
 
     if (IsMoving() || !m_pendingStop)
         m_pathProgress = currentMsTime;
diff --git a/src/game/World.cpp b/src/game/World.cpp
@@ -3113,7 +3113,7 @@ void World::AddAsyncTask(std::function<void()> task) {
     _asyncTasks.push_back(std::move(task));
 }
 
-void World::LogMoneyTrade(ObjectGuid sender, ObjectGuid receiver, uint32 amount, const char* type, uint32 dataInt)
+void World::LogMoneyTrade(ObjectGuid sender, ObjectGuid receiver, uint32 amount, char const* type, uint32 dataInt)
 {
     if (!LogsDatabase || !getConfig(CONFIG_BOOL_LOGSDB_TRADES))
         return;
diff --git a/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/instance_blackrock_spire.cpp b/src/scripts/eastern_kingdoms/burning_steppes/blackrock_spire/instance_blackrock_spire.cpp
@@ -73,13 +73,13 @@ enum
 3726 UBRS, entrance to BWL
 */
 
-static const uint32 aStadiumSpectators[12] =
+static uint32 const aStadiumSpectators[12] =
 {
     NPC_BLACKHAND_VETERAN, NPC_BLACKHAND_VETERAN, NPC_BLACKHAND_VETERAN, NPC_BLACKHAND_ELITE, NPC_BLACKHAND_VETERAN, NPC_BLACKHAND_VETERAN,
     NPC_BLACKHAND_VETERAN, NPC_BLACKHAND_VETERAN, NPC_BLACKHAND_VETERAN, NPC_BLACKHAND_ELITE, NPC_BLACKHAND_VETERAN, NPC_BLACKHAND_VETERAN
 };
 
-static const Position aSpectatorsSpawnLocs[12] =
+static Position const aSpectatorsSpawnLocs[12] =
 {
     { 163.3209f, -340.9818f, 111.0216f, 4.818223f },
     { 164.2471f, -339.0313f, 111.0368f, 1.413717f },
@@ -95,7 +95,7 @@ static const Position aSpectatorsSpawnLocs[12] =
     { 111.9971f, -363.0948f, 116.929f, 5.951573f },
 };
 
-static const Position aSpectatorsTargetLocs[12] =
+static Position const aSpectatorsTargetLocs[12] =
 {
     { 160.619f, -395.826f, 121.9752f, -1.502597f },
     { 162.1428f, -395.1175f, 121.9751f, -1.67753f },
@@ -111,7 +111,7 @@ static const Position aSpectatorsTargetLocs[12] =
     { 149.3754f, -395.7497f, 121.9753f, -1.714769f },
 };
 
-static const Position aStadiumLocs[7] =
+static Position const aStadiumLocs[7] =
 {
     {210.00f, -420.30f, 110.94f, 3.14f},                    // dragons summon location
     {211.762f,-397.58f, 111.18f, 4.74f},                    // Gyth summon location
@@ -123,7 +123,7 @@ static const Position aStadiumLocs[7] =
 };
 
 // Stadium event description
-static const uint32 aStadiumEventNpcs[MAX_STADIUM_WAVES][MAX_STADIUM_MOBS_PER_WAVE] =
+static uint32 const aStadiumEventNpcs[MAX_STADIUM_WAVES][MAX_STADIUM_MOBS_PER_WAVE] =
 {
     {NPC_CHROMATIC_WHELP, NPC_CHROMATIC_WHELP, NPC_CHROMATIC_WHELP, NPC_CHROMATIC_DRAGON, 0},
     {NPC_CHROMATIC_WHELP, NPC_CHROMATIC_WHELP, NPC_CHROMATIC_WHELP, NPC_CHROMATIC_DRAGON, 0},
diff --git a/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_golemagg.cpp b/src/scripts/eastern_kingdoms/burning_steppes/molten_core/boss_golemagg.cpp
@@ -169,7 +169,7 @@ struct boss_golemaggAI : public ScriptedAI
 
     void UpdateEvents()
     {
-        while (const uint32 eventId = m_CombatEvents.ExecuteEvent())
+        while (uint32 const eventId = m_CombatEvents.ExecuteEvent())
         {
             switch (eventId)
             {
@@ -306,7 +306,7 @@ struct mob_core_ragerAI : public ScriptedAI
 
     void UpdateEvents()
     {
-        while (const uint32 eventId = m_CombatEvents.ExecuteEvent())
+        while (uint32 const eventId = m_CombatEvents.ExecuteEvent())
         {
             switch (eventId)
             {
diff --git a/src/scripts/eastern_kingdoms/loch_modan/loch_modan.cpp b/src/scripts/eastern_kingdoms/loch_modan/loch_modan.cpp
@@ -43,7 +43,7 @@ enum MiranData
     NPC_DARK_IRON_RAIDER  = 2149
 };
 
-static const Position m_afAmbushSpawn[] =
+static Position const m_afAmbushSpawn[] =
 {
     { -5691.93f, -3745.91f, 319.159f, 2.21f},
     { -5706.98f, -3745.39f, 318.728f, 1.04f}
@@ -135,7 +135,7 @@ enum SaeanData
     FACTION_HOSTILE        = 54
 };
 
-static const Position darkIronAmbusherSpawns[] =
+static Position const darkIronAmbusherSpawns[] =
 {
     { -5759.852051f, -3441.279053f, 305.573212f, 2.174024f },
     { -5757.629883f, -3437.680908f, 304.265106f, 2.610265f }
diff --git a/src/scripts/kalimdor/dustwallow_marsh/dustwallow_marsh.cpp b/src/scripts/kalimdor/dustwallow_marsh/dustwallow_marsh.cpp
@@ -32,7 +32,7 @@ EndContentData */
 // Full quest event implementation (Missing Diplomat part 14 id:1265).
 // Author: Kampeador
 //-----------------------------------------------------------------------------
-static const Position tervoshSpawnPoint = { -3476.860840f, -4106.740723f, 17.107151f, 5.420159f };
+static Position const tervoshSpawnPoint = { -3476.860840f, -4106.740723f, 17.107151f, 5.420159f };
 
 enum
 {
diff --git a/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_ouro.cpp b/src/scripts/kalimdor/silithus/temple_of_ahnqiraj/boss_ouro.cpp
@@ -71,8 +71,8 @@ enum
  * https://www.youtube.com/watch?v=REmX3uRTFkQ. The video is slightly sped up, so time was counted by the ticking of buffs on the player.
  * More confirmation from classic sniffs https://i.imgur.com/YIA8veT.png
  */
-const uint32_t SUBMERGE_ANIMATION_INVIS    = 2000;
-const uint32_t SWEEP_TIMER                 = 20500;
+uint32 const SUBMERGE_ANIMATION_INVIS    = 2000;
+uint32 const SWEEP_TIMER                 = 20500;
 
 struct boss_ouroAI : public ScriptedAI
 {

Original file line number	Diff line number	Diff line change
`@@ -995,7 +995,7 @@ namespace MMAP`
`995`	`995`	`}`
`996`	`996`
`997`	`997`	`/**************************************************************************/`
`998`		`- void TerrainBuilder::loadOffMeshConnections(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, const char* offMeshFilePath)`
	`998`	`+ void TerrainBuilder::loadOffMeshConnections(uint32 mapID, uint32 tileX, uint32 tileY, MeshData& meshData, char const* offMeshFilePath)`
`999`	`999`	`{`
`1000`	`1000`	`// no meshfile input given?`
`1001`	`1001`	`if (offMeshFilePath == nullptr)`
Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,8 @@ class NGrid`
`109`	`109`	`return i_cells[x][y];`
`110`	`110`	`}`
`111`	`111`
`112`		`- const uint32& GetGridId() const { return i_gridId; }`
`113`		`- void SetGridId(const uint32 id) { i_gridId = id; }`
	`112`	`+ uint32 const& GetGridId() const { return i_gridId; }`
	`113`	`+ void SetGridId(uint32 const id) { i_gridId = id; }`
`114`	`114`	`grid_state_t GetGridState() const { return i_cellstate; }`
`115`	`115`	`void SetGridState(grid_state_t s) { i_cellstate = s; }`
`116`	`116`	`uint32 getX() const { return i_x; }`
`@@ -134,13 +134,13 @@ class NGrid`
`134`	`134`	`void UpdateTimeTracker(time_t diff) { i_GridInfo.UpdateTimeTracker(diff); }`
`135`	`135`
`136`	`136`	`template<class SPECIFIC_OBJECT>`
`137`		`- void AddWorldObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj)`
	`137`	`+ void AddWorldObject(uint32 const x, uint32 const y, SPECIFIC_OBJECT *obj)`
`138`	`138`	`{`
`139`	`139`	`getGridType(x, y).AddWorldObject(obj);`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`template<class SPECIFIC_OBJECT>`
`143`		`- void RemoveWorldObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj)`
	`143`	`+ void RemoveWorldObject(uint32 const x, uint32 const y, SPECIFIC_OBJECT *obj)`
`144`	`144`	`{`
`145`	`145`	`getGridType(x, y).RemoveWorldObject(obj);`
`146`	`146`	`}`
`@@ -154,7 +154,7 @@ class NGrid`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`template<class T, class TT>`
`157`		`- void Visit(const uint32 &x, const uint32 &y, TypeContainerVisitor<T, TypeMapContainer<TT> > &visitor)`
	`157`	`+ void Visit(uint32 const &x, uint32 const &y, TypeContainerVisitor<T, TypeMapContainer<TT> > &visitor)`
`158`	`158`	`{`
`159`	`159`	`getGridType(x, y).Visit(visitor);`
`160`	`160`	`}`
`@@ -170,20 +170,20 @@ class NGrid`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`template<class SPECIFIC_OBJECT>`
`173`		`- bool AddGridObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj)`
	`173`	`+ bool AddGridObject(uint32 const x, uint32 const y, SPECIFIC_OBJECT *obj)`
`174`	`174`	`{`
`175`	`175`	`return getGridType(x, y).AddGridObject(obj);`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`template<class SPECIFIC_OBJECT>`
`179`		`- bool RemoveGridObject(const uint32 x, const uint32 y, SPECIFIC_OBJECT *obj)`
	`179`	`+ bool RemoveGridObject(uint32 const x, uint32 const y, SPECIFIC_OBJECT *obj)`
`180`	`180`	`{`
`181`	`181`	`return getGridType(x, y).RemoveGridObject(obj);`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`private:`
`185`	`185`
`186`		`- GridType& getGridType(const uint32& x, const uint32& y)`
	`186`	`+ GridType& getGridType(uint32 const& x, uint32 const& y)`
`187`	`187`	`{`
`188`	`188`	`assert(x < N);`
`189`	`189`	`assert(y < N);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`using namespace Geometry;`
`18`	`18`
`19`		`-const char* GetMovementCheatName(CheatType flagId)`
	`19`	`+char const* GetMovementCheatName(CheatType flagId)`
`20`	`20`	`{`
`21`	`21`	`switch (flagId)`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1411,7 +1411,7 @@ void ChatHandler::LoadRbacPermissions()`
`1411`	`1411`	`}`
`1412`	`1412`	`}`
`1413`	`1413`
`1414`		`-bool ChatHandler::SetPermissionMaskForCommandInTable(ChatCommand* commandTable, const char* text, uint32 permissionId)`
	`1414`	`+bool ChatHandler::SetPermissionMaskForCommandInTable(ChatCommand* commandTable, char const* text, uint32 permissionId)`
`1415`	`1415`	`{`
`1416`	`1416`	std::string fullcommand = text; // original `text` can't be used. It content destroyed in command code processing.
`1417`	`1417`
Original file line number	Diff line number	Diff line change
`@@ -116,8 +116,8 @@ bool MirrorTimer::Update(uint32 diff)`
`116`	`116`	`if (!m_tracker.Passed())`
`117`	`117`	`return true;`
`118`	`118`
`119`		`- const uint32 interval = m_tracker.GetInterval();`
`120`		`- const uint32 overflow = (m_tracker.GetCurrent() - interval);`
	`119`	`+ uint32 const interval = m_tracker.GetInterval();`
	`120`	`+ uint32 const overflow = (m_tracker.GetCurrent() - interval);`
`121`	`121`
`122`	`122`	`m_tracker.SetCurrent(interval);`
`123`	`123`
`@@ -135,7 +135,7 @@ bool MirrorTimer::Update(uint32 diff)`
`135`	`135`	`}`
`136`	`136`	`else // Timer regenerating`
`137`	`137`	`{`
`138`		`- const uint32 current = m_tracker.GetCurrent();`
	`138`	`+ uint32 const current = m_tracker.GetCurrent();`
`139`	`139`
`140`	`140`	`if (current > diff)`
`141`	`141`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1564,7 +1564,7 @@ float WorldObject::GetSizeFactorForDistance(WorldObject const* obj, SizeFactor d`
`1564`	`1564`	`return sizefactor;`
`1565`	`1565`	`}`
`1566`	`1566`
`1567`		`-float WorldObject::GetDistance(const WorldObject* obj, SizeFactor distcalc) const`
	`1567`	`+float WorldObject::GetDistance(WorldObject const* obj, SizeFactor distcalc) const`
`1568`	`1568`	`{`
`1569`	`1569`	`ASSERT(obj);`
`1570`	`1570`	`float dx = GetPositionX() - obj->GetPositionX();`
`@@ -1644,7 +1644,7 @@ bool WorldObject::IsInMap(WorldObject const* obj) const`
`1644`	`1644`	`return IsInWorld() && obj->IsInWorld() && (FindMap() == obj->FindMap());`
`1645`	`1645`	`}`
`1646`	`1646`
`1647`		`-bool WorldObject::_IsWithinDist(WorldObject const* obj, float const dist2compare, const bool is3D, SizeFactor distcalc) const`
	`1647`	`+bool WorldObject::_IsWithinDist(WorldObject const* obj, float const dist2compare, bool const is3D, SizeFactor distcalc) const`
`1648`	`1648`	`{`
`1649`	`1649`	`ASSERT(obj);`
`1650`	`1650`	`float const dx = GetPositionX() - obj->GetPositionX();`