aboutsummaryrefslogtreecommitdiff
path: root/src/game/Map.h
diff options
context:
space:
mode:
authorsilver1ce <none@none>2010-01-07 04:05:26 +0200
committersilver1ce <none@none>2010-01-07 04:05:26 +0200
commitde414a2b198863943046decd9bca919bb70e1c2c (patch)
tree87dcbadf1486cd07196154d6f0c4d1d14aa3dbf1 /src/game/Map.h
parentb0e7dc95a4a05f3e78c833c0de29749e4df044af (diff)
solved problems, that came after 6b22e47d1c
--HG-- branch : trunk
Diffstat (limited to 'src/game/Map.h')
-rw-r--r--src/game/Map.h17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/game/Map.h b/src/game/Map.h
index a1958677807..698329562b5 100644
--- a/src/game/Map.h
+++ b/src/game/Map.h
@@ -687,46 +687,43 @@ template<class NOTIFIER>
inline void
Map::VisitAll(const float &x, const float &y, float radius, NOTIFIER &notifier)
{
- float x_off, y_off;
- CellPair p(Trinity::ComputeCellPair(x, y, x_off, y_off));
+ CellPair p(Trinity::ComputeCellPair(x, y));
Cell cell(p);
cell.data.Part.reserved = ALL_DISTRICT;
cell.SetNoCreate();
CellLock<GridReadGuard> cell_lock(cell, p);
TypeContainerVisitor<NOTIFIER, WorldTypeMapContainer> world_object_notifier(notifier);
- cell_lock->Visit(cell_lock, world_object_notifier, *this, radius, x_off, y_off);
+ cell_lock->Visit(cell_lock, world_object_notifier, *this, radius, x, y);
TypeContainerVisitor<NOTIFIER, GridTypeMapContainer > grid_object_notifier(notifier);
- cell_lock->Visit(cell_lock, grid_object_notifier, *this, radius, x_off, y_off);
+ cell_lock->Visit(cell_lock, grid_object_notifier, *this, radius, x, y);
}
template<class NOTIFIER>
inline void
Map::VisitWorld(const float &x, const float &y, float radius, NOTIFIER &notifier)
{
- float x_off, y_off;
- CellPair p(Trinity::ComputeCellPair(x, y, x_off, y_off));
+ CellPair p(Trinity::ComputeCellPair(x, y));
Cell cell(p);
cell.data.Part.reserved = ALL_DISTRICT;
cell.SetNoCreate();
CellLock<GridReadGuard> cell_lock(cell, p);
TypeContainerVisitor<NOTIFIER, WorldTypeMapContainer> world_object_notifier(notifier);
- cell_lock->Visit(cell_lock, world_object_notifier, *this, radius, x_off, y_off);
+ cell_lock->Visit(cell_lock, world_object_notifier, *this, radius, x, y);
}
template<class NOTIFIER>
inline void
Map::VisitGrid(const float &x, const float &y, float radius, NOTIFIER &notifier)
{
- float x_off, y_off;
- CellPair p(Trinity::ComputeCellPair(x, y, x_off, y_off));
+ CellPair p(Trinity::ComputeCellPair(x, y));
Cell cell(p);
cell.data.Part.reserved = ALL_DISTRICT;
cell.SetNoCreate();
CellLock<GridReadGuard> cell_lock(cell, p);
TypeContainerVisitor<NOTIFIER, GridTypeMapContainer > grid_object_notifier(notifier);
- cell_lock->Visit(cell_lock, grid_object_notifier, *this, radius, x_off, y_off);
+ cell_lock->Visit(cell_lock, grid_object_notifier, *this, radius, x, y);
}
#endif