From d8692c1dc7ad5bcc98c3a143d025ea666b9f33b3 Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Wed, 26 Nov 2014 19:22:41 -0800 Subject: [PATCH] InVWater converted to xyz_location --- zone/forage.cpp | 2 +- zone/water_map.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/zone/forage.cpp b/zone/forage.cpp index ad4959ec5..34bfdbc12 100644 --- a/zone/forage.cpp +++ b/zone/forage.cpp @@ -238,7 +238,7 @@ bool Client::CanFish() { rodPosition.m_Z = zone->zonemap->FindBestZ(dest, nullptr) + 4; bool in_lava = zone->watermap->InLava(rodPosition.m_X, rodPosition.m_Y, rodPosition.m_Z); - bool in_water = zone->watermap->InWater(rodPosition) || zone->watermap->InVWater(rodPosition.m_X, rodPosition.m_Y, rodPosition.m_Z); + bool in_water = zone->watermap->InWater(rodPosition) || zone->watermap->InVWater(rodPosition); //Message(0, "Rod is at %4.3f, %4.3f, %4.3f, InWater says %d, InLava says %d", RodX, RodY, RodZ, in_water, in_lava); if (in_lava) { Message_StringID(MT_Skills, FISHING_LAVA); //Trying to catch a fire elemental or something? diff --git a/zone/water_map.h b/zone/water_map.h index 6d5b70443..d8428a6ef 100644 --- a/zone/water_map.h +++ b/zone/water_map.h @@ -27,7 +27,7 @@ public: static WaterMap* LoadWaterMapfile(std::string zone_name); virtual WaterRegionType ReturnRegionType(const xyz_location& location) const { return RegionTypeNormal; } virtual bool InWater(const xyz_location& location) const { return false; } - virtual bool InVWater(float y, float x, float z) const { return false; } + virtual bool InVWater(const xyz_location& location) const { return false; } virtual bool InLava(float y, float x, float z) const { return false; } virtual bool InLiquid(float y, float x, float z) const { return false; }