pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-11 11:48:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

InWater(y,x,z) converted to InWater(xyz_location)

Browse Source
This commit is contained in:
Arthur Ice
2014-11-26 19:18:06 -08:00
parent d9d89ba9b3
commit f9e65acf78
6 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/water_map_v2.cpp
+5 -4
View File
@@ -17,8 +17,8 @@ WaterRegionType WaterMapV2::ReturnRegionType(float y, float x, float z) const {
return RegionTypeNormal;
}
bool WaterMapV2::InWater(float y, float x, float z) const {
return ReturnRegionType(y, x, z) == RegionTypeWater;
bool WaterMapV2::InWater(const xyz_location& location) const {
return ReturnRegionType(location.m_Y, location.m_X, location.m_Z) == RegionTypeWater;
}
bool WaterMapV2::InVWater(float y, float x, float z) const {
@@ -30,7 +30,8 @@ bool WaterMapV2::InLava(float y, float x, float z) const {
}
bool WaterMapV2::InLiquid(float y, float x, float z) const {
return InWater(y, x, z) || InLava(y, x, z);
auto location = xyz_location(y, x, z);
return InWater(location) || InLava(y, x, z);
}
bool WaterMapV2::Load(FILE *fp) {
@@ -106,7 +107,7 @@ bool WaterMapV2::Load(FILE *fp) {
return false;
}
regions.push_back(std::make_pair((WaterRegionType)region_type,
regions.push_back(std::make_pair((WaterRegionType)region_type,
OrientedBoundingBox(glm::vec3(x, y, z), glm::vec3(x_rot, y_rot, z_rot), glm::vec3(x_scale, y_scale, z_scale), glm::vec3(x_extent, y_extent, z_extent))));
}