From 4094d43c49acca8c651cf8ecdd71f4afb24438b4 Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Wed, 26 Nov 2014 19:39:39 -0800 Subject: [PATCH] InLiquid 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 6f5977d79..9a8eb9564 100644 --- a/zone/water_map_v2.cpp +++ b/zone/water_map_v2.cpp @@ -29,8 +29,7 @@ bool WaterMapV2::InLava(const xyz_location& location) const { return ReturnRegionType(location) == RegionTypeLava; } -bool WaterMapV2::InLiquid(float y, float x, float z) const { - auto location = xyz_location(x, y, z); +bool WaterMapV2::InLiquid(const xyz_location& location) const { return InWater(location) || InLava(location); } diff --git a/zone/water_map_v2.h b/zone/water_map_v2.h index 02e549cc7..a0adccc48 100644 --- a/zone/water_map_v2.h +++ b/zone/water_map_v2.h @@ -16,7 +16,7 @@ public: virtual bool InWater(const xyz_location& location) const; virtual bool InVWater(const xyz_location& location) const; virtual bool InLava(const xyz_location& location) const; - virtual bool InLiquid(float y, float x, float z) const; + virtual bool InLiquid(const xyz_location& location) const; protected: virtual bool Load(FILE *fp);