aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsilver1ce <none@none>2010-01-10 22:28:36 +0200
committersilver1ce <none@none>2010-01-10 22:28:36 +0200
commit8c85caf41d69999676878eae93ba2a6bd44a1d1a (patch)
tree4372a41f07cb7dc8fbce12169986757ee265b2e9
parentbf33b9b49477d481387357e12ec1399bc40deca2 (diff)
Resolves #259 fixed crash, caused by incorrect cell_id generation
--HG-- branch : trunk
-rw-r--r--src/game/Map.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 02c6714bbd3..d7ca6ae7a70 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -836,9 +836,9 @@ void Map::ProcessRelocationNotifies()
CellPair cell_min(gx*MAX_NUMBER_OF_CELLS, gy*MAX_NUMBER_OF_CELLS);
CellPair cell_max(cell_min.x_coord + MAX_NUMBER_OF_CELLS, cell_min.y_coord+MAX_NUMBER_OF_CELLS);
- for(uint32 x = cell_min.x_coord; x <= cell_max.x_coord; ++x)
+ for(uint32 x = cell_min.x_coord; x < cell_max.x_coord; ++x)
{
- for(uint32 y = cell_min.y_coord; y <= cell_max.y_coord; ++y)
+ for(uint32 y = cell_min.y_coord; y < cell_max.y_coord; ++y)
{
uint32 cell_id = (y * TOTAL_NUMBER_OF_CELLS_PER_MAP) + x;
if(!isCellMarked(cell_id))
@@ -885,9 +885,9 @@ void Map::ResetNotifies(uint16 notify_mask)
CellPair cell_min(gx*MAX_NUMBER_OF_CELLS, gy*MAX_NUMBER_OF_CELLS);
CellPair cell_max(cell_min.x_coord + MAX_NUMBER_OF_CELLS, cell_min.y_coord+MAX_NUMBER_OF_CELLS);
- for(uint32 x = cell_min.x_coord; x <= cell_max.x_coord; ++x)
+ for(uint32 x = cell_min.x_coord; x < cell_max.x_coord; ++x)
{
- for(uint32 y = cell_min.y_coord; y <= cell_max.y_coord; ++y)
+ for(uint32 y = cell_min.y_coord; y < cell_max.y_coord; ++y)
{
uint32 cell_id = (y * TOTAL_NUMBER_OF_CELLS_PER_MAP) + x;
if(!isCellMarked(cell_id))