diff options
author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-05 16:55:17 +0100 |
---|---|---|
committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-05 16:55:17 +0100 |
commit | 24e0eb1812f94c5092009f78ced3306f142d2789 (patch) | |
tree | 0118c5abc4e0bb3e8e2a218ca2c9c1934f8eb0d1 /src/server/collision/BoundingIntervalHierarchy.cpp | |
parent | 8db66bfefdb9ec7a722dd93aadbbd818c567fba0 (diff) | |
parent | 7dd0cd4403d7f28343a751e7b85aeb30d3968ff5 (diff) |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
src/server/game/Movement/Spline/MoveSplineInit.cpp
Diffstat (limited to 'src/server/collision/BoundingIntervalHierarchy.cpp')
-rw-r--r-- | src/server/collision/BoundingIntervalHierarchy.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/collision/BoundingIntervalHierarchy.cpp b/src/server/collision/BoundingIntervalHierarchy.cpp index 76218936879..ad3753ea3c9 100644 --- a/src/server/collision/BoundingIntervalHierarchy.cpp +++ b/src/server/collision/BoundingIntervalHierarchy.cpp @@ -241,7 +241,7 @@ void BIH::subdivide(int left, int right, std::vector<uint32> &tempTree, buildDat bool BIH::writeToFile(FILE* wf) const { uint32 treeSize = tree.size(); - uint32 check=0, count=0; + uint32 check=0, count; check += fwrite(&bounds.low(), sizeof(float), 3, wf); check += fwrite(&bounds.high(), sizeof(float), 3, wf); check += fwrite(&treeSize, sizeof(uint32), 1, wf); |