diff options
| author | Spp <spp@jorge.gr> | 2012-11-09 14:26:27 +0100 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-11-09 14:26:27 +0100 |
| commit | c51380690ffeb82c1c75d3981c424612c0f2bc9f (patch) | |
| tree | 9b2b90379ceac9d6c0bdb97a744d10a49959a445 /src/server/collision/RegularGrid.h | |
| parent | ccf593c6738ad1073381f1c2d404664e8d4ea187 (diff) | |
| parent | 333b8e5159ada2f1b8cbfd1dd8eb9072754477d7 (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/DataStores/DBCEnums.h
src/server/game/Handlers/PetHandler.cpp
src/server/game/Server/WorldSession.h
Diffstat (limited to 'src/server/collision/RegularGrid.h')
| -rw-r--r-- | src/server/collision/RegularGrid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/collision/RegularGrid.h b/src/server/collision/RegularGrid.h index 00d7b0cd209..5b7d1d74987 100644 --- a/src/server/collision/RegularGrid.h +++ b/src/server/collision/RegularGrid.h @@ -86,7 +86,7 @@ public: static Cell ComputeCell(float fx, float fy) { - Cell c = {fx * (1.f/CELL_SIZE) + (CELL_NUMBER/2), fy * (1.f/CELL_SIZE) + (CELL_NUMBER/2)}; + Cell c = { int(fx * (1.f/CELL_SIZE) + (CELL_NUMBER/2)), int(fy * (1.f/CELL_SIZE) + (CELL_NUMBER/2)) }; return c; } |