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

InLiquid converted to xyz_location

Browse Source
This commit is contained in:
Arthur Ice 2014-11-26 19:39:39 -08:00
parent 2f203fa6bb
commit 4094d43c49
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zone/water_map_v2.cpp
View File

@ -29,8 +29,7 @@ bool WaterMapV2::InLava(const xyz_location& location) const {
return ReturnRegionType(location) == RegionTypeLava; return ReturnRegionType(location) == RegionTypeLava;
} }
bool WaterMapV2::InLiquid(float y, float x, float z) const { bool WaterMapV2::InLiquid(const xyz_location& location) const {
auto location = xyz_location(x, y, z);
return InWater(location) || InLava(location); return InWater(location) || InLava(location);
} }

2
zone/water_map_v2.h
View File

@ -16,7 +16,7 @@ public:
virtual bool InWater(const xyz_location& location) const; virtual bool InWater(const xyz_location& location) const;
virtual bool InVWater(const xyz_location& location) const; virtual bool InVWater(const xyz_location& location) const;
virtual bool InLava(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: protected:
virtual bool Load(FILE *fp); virtual bool Load(FILE *fp);