diff options
Diffstat (limited to 'src/game/Map.h')
| -rw-r--r-- | src/game/Map.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/Map.h b/src/game/Map.h index 5bd7e4d4c30..783683d6d75 100644 --- a/src/game/Map.h +++ b/src/game/Map.h @@ -293,15 +293,15 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>, public MaNGOS::Obj //function for setting up visibility distance for maps on per-type/per-Id basis virtual void InitVisibilityDistance(); - void PlayerRelocation(Player *, float x, float y, float z, float angl); - void CreatureRelocation(Creature *creature, float x, float y, float, float); + void PlayerRelocation(Player *, float x, float y, float z, float orientation); + void CreatureRelocation(Creature *creature, float x, float y, float z, float ang); template<class LOCK_TYPE, class T, class CONTAINER> void Visit(const CellLock<LOCK_TYPE> &cell, TypeContainerVisitor<T, CONTAINER> &visitor); bool IsRemovalGrid(float x, float y) const { GridPair p = Trinity::ComputeGridPair(x, y); - return( !getNGrid(p.x_coord, p.y_coord) || getNGrid(p.x_coord, p.y_coord)->GetGridState() == GRID_STATE_REMOVAL ); + return !getNGrid(p.x_coord, p.y_coord) || getNGrid(p.x_coord, p.y_coord)->GetGridState() == GRID_STATE_REMOVAL; } bool GetUnloadLock(const GridPair &p) const { return getNGrid(p.x_coord, p.y_coord)->getUnloadLock(); } @@ -312,7 +312,7 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>, public MaNGOS::Obj void ResetGridExpiry(NGridType &grid, float factor = 1) const { - grid.ResetTimeTracker((time_t)((float)i_gridExpiry*factor)); + grid.ResetTimeTracker(time_t(float(i_gridExpiry)*factor)); } time_t GetGridExpiry(void) const { return i_gridExpiry; } |