From 5140e6fabf82c3ad114a6239656fd292cba4f0ab Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Wed, 26 Nov 2014 19:37:32 -0800 Subject: [PATCH] InVWater converted to xyz_location --- zone/water_map_v2.cpp | 3 +-- zone/water_map_v2.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/zone/water_map_v2.cpp b/zone/water_map_v2.cpp index 7c9f3bce3..2ba0a7d35 100644 --- a/zone/water_map_v2.cpp +++ b/zone/water_map_v2.cpp @@ -21,8 +21,7 @@ bool WaterMapV2::InWater(const xyz_location& location) const { return ReturnRegionType(location) == RegionTypeWater; } -bool WaterMapV2::InVWater(float y, float x, float z) const { - auto location = xyz_location(x, y, z); +bool WaterMapV2::InVWater(const xyz_location& location) const { return ReturnRegionType(location) == RegionTypeVWater; } diff --git a/zone/water_map_v2.h b/zone/water_map_v2.h index fea136957..5c4ba9e80 100644 --- a/zone/water_map_v2.h +++ b/zone/water_map_v2.h @@ -14,7 +14,7 @@ public: virtual WaterRegionType ReturnRegionType(const xyz_location& location) const; virtual bool InWater(const xyz_location& location) const; - virtual bool InVWater(float y, float x, float z) const; + virtual bool InVWater(const xyz_location& location) const; virtual bool InLava(float y, float x, float z) const; virtual bool InLiquid(float y, float x, float z) const;