diff options
| author | Chaplain <aionthefirst@gmail.com> | 2012-06-21 21:05:45 +0300 |
|---|---|---|
| committer | Chaplain <aionthefirst@gmail.com> | 2012-06-21 21:05:45 +0300 |
| commit | 716e2db0e10673401ba7d6579899a8151ae64208 (patch) | |
| tree | c77fea50792ba67099a042ed37a03bd6aad98296 /src/server/collision | |
| parent | 98479c4555d9c8f0a6f56d30aca6cec68f7e1a71 (diff) | |
Core/Misc: Code-style + some const methods.
Diffstat (limited to 'src/server/collision')
| -rwxr-xr-x | src/server/collision/BoundingIntervalHierarchy.h | 5 | ||||
| -rw-r--r-- | src/server/collision/Maps/TileAssembler.cpp | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/server/collision/BoundingIntervalHierarchy.h b/src/server/collision/BoundingIntervalHierarchy.h index ea70fc3e322..a4bbe21006a 100755 --- a/src/server/collision/BoundingIntervalHierarchy.h +++ b/src/server/collision/BoundingIntervalHierarchy.h @@ -128,7 +128,7 @@ class BIH delete[] dat.primBound; delete[] dat.indices; } - uint32 primCount() { return objects.size(); } + uint32 primCount() const { return objects.size(); } template<typename RayCallback> void intersectRay(const Ray &r, RayCallback& intersectCallback, float &maxDist, bool stopAtFirst=false) const @@ -400,7 +400,8 @@ class BIH void buildHierarchy(std::vector<uint32> &tempTree, buildData &dat, BuildStats &stats); - void createNode(std::vector<uint32> &tempTree, int nodeIndex, uint32 left, uint32 right) { + void createNode(std::vector<uint32> &tempTree, int nodeIndex, uint32 left, uint32 right) const + { // write leaf node tempTree[nodeIndex + 0] = (3 << 30) | left; tempTree[nodeIndex + 1] = right - left + 1; diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp index e7693a70de4..3bfed7d322d 100644 --- a/src/server/collision/Maps/TileAssembler.cpp +++ b/src/server/collision/Maps/TileAssembler.cpp @@ -312,7 +312,7 @@ namespace VMAP // write WorldModel WorldModel model; model.setRootWmoID(raw_model.RootWMOID); - if (raw_model.groupsArray.size()) + if (!raw_model.groupsArray.empty()) { std::vector<GroupModel> groupsArray; |