diff options
| author | maximius <none@none> | 2009-11-21 05:01:03 -0800 |
|---|---|---|
| committer | maximius <none@none> | 2009-11-21 05:01:03 -0800 |
| commit | bd1065156ed29c3e10b6bef88ec4637d5eb8b243 (patch) | |
| tree | 091fb24347692609f17c21937f60c48338c0a396 /src/game | |
| parent | 83fa9466defe8c2e551e7dc2bdbb836cadcd75ef (diff) | |
*Copy and paste woes D:
--HG--
branch : trunk
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/CellImpl.h | 12 | ||||
| -rw-r--r-- | src/game/Player.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/game/CellImpl.h b/src/game/CellImpl.h index 617d567ce32..4f6bec82f8b 100644 --- a/src/game/CellImpl.h +++ b/src/game/CellImpl.h @@ -228,19 +228,19 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi //no jokes here... Actually placing ASSERT() here was good idea, but //we had some problems with DynamicObjects, which pass radius = 0.0f (DB issue?) //maybe it is better to just return when radius <= 0.0f? - if(radius <= 0.0f) + if (radius <= 0.0f) { m.Visit(l, visitor); return; } //lets limit the upper value for search radius - if(radius > 333.0f) + if (radius > 333.0f) radius = 333.0f; //lets calculate object coord offsets from cell borders. CellArea area = Cell::CalculateCellArea(obj, radius); //if radius fits inside standing cell - if(!area) + if (!area) { m.Visit(l, visitor); return; @@ -254,7 +254,7 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi //if radius is known to reach cell area more than 4x4 then we should call optimized VisitCircle //currently this technique works with MAX_NUMBER_OF_CELLS 16 and higher, with lower values //there are nothing to optimize because SIZE_OF_GRID_CELL is too big... - if(((end_cell.x_coord - begin_cell.x_coord) > 4) && ((end_cell.y_coord - begin_cell.y_coord) > 4)) + if (((end_cell.x_coord - begin_cell.x_coord) > 4) && ((end_cell.y_coord - begin_cell.y_coord) > 4)) { VisitCircle(l, visitor, m, begin_cell, end_cell); return; @@ -265,9 +265,9 @@ Cell::Visit(const CellLock<LOCK_TYPE> &l, TypeContainerVisitor<T, CONTAINER> &vi m.Visit(l, visitor); // loop the cell range - for (uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; x++) + for (uint32 x = begin_cell.x_coord; x <= end_cell.x_coord; ++x) { - for (uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; y++) + for (uint32 y = begin_cell.y_coord; y <= end_cell.y_coord; ++y) { CellPair cell_pair(x,y); //lets skip standing cell since we already visited it diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 1d86e6b45b2..ba1547b2219 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -3792,7 +3792,7 @@ bool Player::resetTalents(bool no_cost) */ PlayerTalentMap::iterator plrTalent = m_talents[m_activeSpec]->find(talentInfo->TalentID); - if (plrTalent != m_talents[m_activeSpec]->end( || !m_talents[m_activeSpec]->empty()) + if (plrTalent != m_talents[m_activeSpec]->end( || m_talents[m_activeSpec]->empty()) { for (int8 rank = MAX_TALENT_RANK-1; rank >= 0; --rank) { |
