Core/Misc: Port all the refactors sneaked in master to 3.3.5 include cleanup port

1 files changed, 11 insertions, 11 deletions

diff --git a/src/common/Collision/Models/ModelInstance.h b/src/common/Collision/Models/ModelInstance.h
index c5caf9599be..b342a14fdc6 100644
--- a/src/common/Collision/Models/ModelInstance.h
+++ b/src/common/Collision/Models/ModelInstance.h
@@ -51,25 +51,25 @@ namespace VMAP
             float iScale;
             G3D::AABox iBound;
             std::string name;
-            bool operator==(const ModelSpawn &other) const { return ID == other.ID; }
+            bool operator==(ModelSpawn const& other) const { return ID == other.ID; }
             //uint32 hashCode() const { return ID; }
             // temp?
-            const G3D::AABox& getBounds() const { return iBound; }
+            G3D::AABox const& getBounds() const { return iBound; }
 
-            static bool readFromFile(FILE* rf, ModelSpawn &spawn);
-            static bool writeToFile(FILE* rw, const ModelSpawn &spawn);
+            static bool readFromFile(FILE* rf, ModelSpawn& spawn);
+            static bool writeToFile(FILE* rw, ModelSpawn const& spawn);
     };
 
-    class TC_COMMON_API ModelInstance: public ModelSpawn
+    class TC_COMMON_API ModelInstance : public ModelSpawn
     {
         public:
-            ModelInstance(): iInvScale(0.0f), iModel(nullptr) { }
-            ModelInstance(const ModelSpawn &spawn, WorldModel* model);
+            ModelInstance() : iInvScale(0.0f), iModel(nullptr) { }
+            ModelInstance(ModelSpawn const& spawn, WorldModel* model);
             void setUnloaded() { iModel = nullptr; }
-            bool intersectRay(const G3D::Ray& pRay, float& pMaxDist, bool pStopAtFirstHit, ModelIgnoreFlags ignoreFlags) const;
-            void intersectPoint(const G3D::Vector3& p, AreaInfo &info) const;
-            bool GetLocationInfo(const G3D::Vector3& p, LocationInfo &info) const;
-            bool GetLiquidLevel(const G3D::Vector3& p, LocationInfo &info, float &liqHeight) const;
+            bool intersectRay(G3D::Ray const& pRay, float& pMaxDist, bool pStopAtFirstHit, ModelIgnoreFlags ignoreFlags) const;
+            void intersectPoint(G3D::Vector3 const& p, AreaInfo& info) const;
+            bool GetLocationInfo(G3D::Vector3 const& p, LocationInfo& info) const;
+            bool GetLiquidLevel(G3D::Vector3 const& p, LocationInfo& info, float& liqHeight) const;
             WorldModel* getWorldModel() { return iModel; }
         protected:
             G3D::Matrix3 iInvRot;