diff options
| author | Machiavelli <machiavelli.trinity@gmail.com> | 2012-06-22 05:31:04 -0700 |
|---|---|---|
| committer | Machiavelli <machiavelli.trinity@gmail.com> | 2012-06-22 05:31:04 -0700 |
| commit | cfb53dbf42bd5e1274be07f022f786a1451e515c (patch) | |
| tree | ef19545a1b8e60855305e5eec211e860240f6662 /src/server/game/Maps/Map.cpp | |
| parent | acee199e7882b4c82b2ded20b7cf429263f687d1 (diff) | |
| parent | 716e2db0e10673401ba7d6579899a8151ae64208 (diff) | |
Merge pull request #6885 from Chaplain/clean
Core/Misc: Code-style + some const methods.
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
| -rwxr-xr-x | src/server/game/Maps/Map.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 82659e32016..270c4c782b6 100755 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -1230,7 +1230,7 @@ bool GridMap::loadLiquidData(FILE* in, uint32 offset, uint32 /*size*/) return true; } -uint16 GridMap::getArea(float x, float y) +uint16 GridMap::getArea(float x, float y) const { if (!_areaMap) return _gridArea; @@ -1463,7 +1463,7 @@ float GridMap::getHeightFromUint16(float x, float y) const return (float)((a * x) + (b * y) + c)*_gridIntHeightMultiplier + _gridHeight; } -float GridMap::getLiquidLevel(float x, float y) +float GridMap::getLiquidLevel(float x, float y) const { if (!_liquidMap) return _liquidLevel; @@ -1483,7 +1483,7 @@ float GridMap::getLiquidLevel(float x, float y) } // Why does this return LIQUID data? -uint8 GridMap::getTerrainType(float x, float y) +uint8 GridMap::getTerrainType(float x, float y) const { if (!_liquidFlags) return 0; |