diff options
Diffstat (limited to 'src/server/collision')
| -rw-r--r-- | src/server/collision/Management/VMapManager2.cpp | 15 | ||||
| -rwxr-xr-x | src/server/collision/Management/VMapManager2.h | 1 | ||||
| -rw-r--r-- | src/server/collision/Models/WorldModel.cpp | 3 |
3 files changed, 3 insertions, 16 deletions
diff --git a/src/server/collision/Management/VMapManager2.cpp b/src/server/collision/Management/VMapManager2.cpp index 7c41a5bed41..9f32c749c5c 100644 --- a/src/server/collision/Management/VMapManager2.cpp +++ b/src/server/collision/Management/VMapManager2.cpp @@ -62,17 +62,6 @@ namespace VMAP return pos; } - Vector3 VMapManager2::convertPositionToMangosRep(float x, float y, float z) const - { - Vector3 pos; - const float mid = 0.5f * 64.0f * 533.33333333f; - pos.x = mid - x; - pos.y = mid - y; - pos.z = z; - - return pos; - } - // move to MapTree too? std::string VMapManager2::getMapFileName(unsigned int mapId) { @@ -175,7 +164,7 @@ namespace VMAP Vector3 pos2 = convertPositionToInternalRep(x2, y2, z2); Vector3 resultPos; bool result = instanceTree->second->getObjectHitPos(pos1, pos2, resultPos, modifyDist); - resultPos = convertPositionToMangosRep(resultPos.x, resultPos.y, resultPos.z); + resultPos = convertPositionToInternalRep(resultPos.x, resultPos.y, resultPos.z); rx = resultPos.x; ry = resultPos.y; rz = resultPos.z; @@ -222,7 +211,7 @@ namespace VMAP { Vector3 pos = convertPositionToInternalRep(x, y, z); bool result = instanceTree->second->getAreaInfo(pos, flags, adtId, rootId, groupId); - // z is not touched by convertPositionToMangosRep(), so just copy + // z is not touched by convertPositionToInternalRep(), so just copy z = pos.z; return result; } diff --git a/src/server/collision/Management/VMapManager2.h b/src/server/collision/Management/VMapManager2.h index dc1b4c84ade..ac293e2071b 100755 --- a/src/server/collision/Management/VMapManager2.h +++ b/src/server/collision/Management/VMapManager2.h @@ -78,7 +78,6 @@ namespace VMAP public: // public for debug G3D::Vector3 convertPositionToInternalRep(float x, float y, float z) const; - G3D::Vector3 convertPositionToMangosRep(float x, float y, float z) const; static std::string getMapFileName(unsigned int mapId); VMapManager2(); diff --git a/src/server/collision/Models/WorldModel.cpp b/src/server/collision/Models/WorldModel.cpp index da75492c9c6..55aad9bb029 100644 --- a/src/server/collision/Models/WorldModel.cpp +++ b/src/server/collision/Models/WorldModel.cpp @@ -505,9 +505,8 @@ namespace VMAP if (!wf) return false; - bool result = true; uint32 chunkSize, count; - result = fwrite(VMAP_MAGIC, 1, 8, wf) == 8; + bool result = fwrite(VMAP_MAGIC, 1, 8, wf) == 8; if (result && fwrite("WMOD", 1, 4, wf) != 4) result = false; chunkSize = sizeof(uint32) + sizeof(uint32); if (result && fwrite(&chunkSize, sizeof(uint32), 1, wf) != 1) result = false; |