From 143c0cf0f96fd6d252a96c4eb8e0ab3b7d1b093e Mon Sep 17 00:00:00 2001 From: KimLS Date: Fri, 23 Jan 2015 12:23:24 -0800 Subject: [PATCH] Fix for x and y swapped on water maps --- zone/water_map_v1.cpp | 2 +- zone/water_map_v2.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zone/water_map_v1.cpp b/zone/water_map_v1.cpp index 28cafe67c..431df4224 100644 --- a/zone/water_map_v1.cpp +++ b/zone/water_map_v1.cpp @@ -11,7 +11,7 @@ WaterMapV1::~WaterMapV1() { } WaterRegionType WaterMapV1::ReturnRegionType(const glm::vec3& location) const { - return BSPReturnRegionType(1, location); + return BSPReturnRegionType(1, glm::vec3(location.y, location.x, location.z)); } bool WaterMapV1::InWater(const glm::vec3& location) const { diff --git a/zone/water_map_v2.cpp b/zone/water_map_v2.cpp index 2931a62c1..a57999a48 100644 --- a/zone/water_map_v2.cpp +++ b/zone/water_map_v2.cpp @@ -10,7 +10,7 @@ WaterRegionType WaterMapV2::ReturnRegionType(const glm::vec3& location) const { size_t sz = regions.size(); for(size_t i = 0; i < sz; ++i) { auto const ®ion = regions[i]; - if (region.second.ContainsPoint(glm::vec3(location.x, location.y, location.z))) { + if (region.second.ContainsPoint(glm::vec3(location.y, location.x, location.z))) { return region.first; } }