diff options
Diffstat (limited to 'src/server/collision')
| -rw-r--r-- | src/server/collision/BoundingIntervalHierarchy.cpp | 8 | ||||
| -rw-r--r-- | src/server/collision/Management/MMapFactory.h | 2 | ||||
| -rw-r--r-- | src/server/collision/Maps/MapTree.cpp | 2 | ||||
| -rw-r--r-- | src/server/collision/Maps/MapTree.h | 4 | ||||
| -rw-r--r-- | src/server/collision/Maps/TileAssembler.cpp | 2 | ||||
| -rw-r--r-- | src/server/collision/Models/WorldModel.h | 6 |
6 files changed, 11 insertions, 13 deletions
diff --git a/src/server/collision/BoundingIntervalHierarchy.cpp b/src/server/collision/BoundingIntervalHierarchy.cpp index 4c1f449da25..340d66ddaf0 100644 --- a/src/server/collision/BoundingIntervalHierarchy.cpp +++ b/src/server/collision/BoundingIntervalHierarchy.cpp @@ -18,12 +18,10 @@ #include "BoundingIntervalHierarchy.h" -#if defined __APPLE__ - #define isnan std::isnan -#elif defined __CYGWIN__ - #define isnan std::isnan -#elif defined _MSC_VER +#ifdef _MSC_VER #define isnan _isnan +#else + #define isnan std::isnan #endif void BIH::buildHierarchy(std::vector<uint32> &tempTree, buildData &dat, BuildStats &stats) diff --git a/src/server/collision/Management/MMapFactory.h b/src/server/collision/Management/MMapFactory.h index 00f19a194d3..038d44a941c 100644 --- a/src/server/collision/Management/MMapFactory.h +++ b/src/server/collision/Management/MMapFactory.h @@ -31,7 +31,7 @@ namespace MMAP { MMAP_LOAD_RESULT_ERROR, MMAP_LOAD_RESULT_OK, - MMAP_LOAD_RESULT_IGNORED, + MMAP_LOAD_RESULT_IGNORED }; // static class diff --git a/src/server/collision/Maps/MapTree.cpp b/src/server/collision/Maps/MapTree.cpp index eb4b4555cb4..bd925d5a0c4 100644 --- a/src/server/collision/Maps/MapTree.cpp +++ b/src/server/collision/Maps/MapTree.cpp @@ -243,7 +243,7 @@ namespace VMAP FILE* rf = fopen(fullname.c_str(), "rb"); if (!rf) return false; - // TODO: check magic number when implemented... + /// @todo check magic number when implemented... char tiled; char chunk[8]; if (!readChunk(rf, chunk, VMAP_MAGIC, 8) || fread(&tiled, sizeof(char), 1, rf) != 1) diff --git a/src/server/collision/Maps/MapTree.h b/src/server/collision/Maps/MapTree.h index 5de8e616d2b..e97c44d089e 100644 --- a/src/server/collision/Maps/MapTree.h +++ b/src/server/collision/Maps/MapTree.h @@ -31,7 +31,7 @@ namespace VMAP struct LocationInfo { - LocationInfo(): hitInstance(0), hitModel(0), ground_Z(-G3D::inf()) {}; + LocationInfo(): hitInstance(0), hitModel(0), ground_Z(-G3D::inf()) {} const ModelInstance* hitInstance; const GroupModel* hitModel; float ground_Z; @@ -85,7 +85,7 @@ namespace VMAP struct AreaInfo { - AreaInfo(): result(false), ground_Z(-G3D::inf()) {}; + AreaInfo(): result(false), ground_Z(-G3D::inf()) {} bool result; float ground_Z; uint32 flags; diff --git a/src/server/collision/Maps/TileAssembler.cpp b/src/server/collision/Maps/TileAssembler.cpp index c087f773630..ba1ae275c9a 100644 --- a/src/server/collision/Maps/TileAssembler.cpp +++ b/src/server/collision/Maps/TileAssembler.cpp @@ -88,7 +88,7 @@ namespace VMAP } else if (entry->second.flags & MOD_WORLDSPAWN) // WMO maps and terrain maps use different origin, so we need to adapt :/ { - // TODO: remove extractor hack and uncomment below line: + /// @todo remove extractor hack and uncomment below line: //entry->second.iPos += Vector3(533.33333f*32, 533.33333f*32, 0.f); entry->second.iBound = entry->second.iBound + Vector3(533.33333f*32, 533.33333f*32, 0.f); } diff --git a/src/server/collision/Models/WorldModel.h b/src/server/collision/Models/WorldModel.h index cea32cfedfb..9d588316cce 100644 --- a/src/server/collision/Models/WorldModel.h +++ b/src/server/collision/Models/WorldModel.h @@ -36,8 +36,8 @@ namespace VMAP class MeshTriangle { public: - MeshTriangle(){}; - MeshTriangle(uint32 na, uint32 nb, uint32 nc): idx0(na), idx1(nb), idx2(nc) {}; + MeshTriangle(){} + MeshTriangle(uint32 na, uint32 nb, uint32 nc): idx0(na), idx1(nb), idx2(nc) {} uint32 idx0; uint32 idx1; @@ -59,7 +59,7 @@ namespace VMAP bool writeToFile(FILE* wf); static bool readFromFile(FILE* rf, WmoLiquid* &liquid); private: - WmoLiquid(): iHeight(0), iFlags(0) {}; + WmoLiquid(): iHeight(0), iFlags(0) {} uint32 iTilesX; //!< number of tiles in x direction, each uint32 iTilesY; G3D::Vector3 iCorner; //!< the lower corner |