pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-02-17 13:52:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

InLava converted to xyz_location

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

5
zone/water_map_v2.cpp
View File

@ -25,14 +25,13 @@ bool WaterMapV2::InVWater(const xyz_location& location) const {
return ReturnRegionType(location) == RegionTypeVWater;
}
bool WaterMapV2::InLava(float y, float x, float z) const {
auto location = xyz_location(x, y, z);
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);
return InWater(location) || InLava(y, x, z);
return InWater(location) || InLava(location);
}
bool WaterMapV2::Load(FILE *fp) {

2
zone/water_map_v2.h
View File

@ -15,7 +15,7 @@ public:
virtual WaterRegionType ReturnRegionType(const xyz_location& location) const;
virtual bool InWater(const xyz_location& location) const;
virtual bool InVWater(const xyz_location& location) const;
virtual bool InLava(float y, float x, float z) const;
virtual bool InLava(const xyz_location& location) const;
virtual bool InLiquid(float y, float x, float z) const;
protected: