From c0faaa9c208e6cd8303dcf2c05c435fab888ff2d Mon Sep 17 00:00:00 2001 From: Arthur Ice Date: Wed, 26 Nov 2014 19:20:41 -0800 Subject: [PATCH] ReturnRegionType converted to xyz_location --- zone/command.cpp | 4 ++-- zone/water_map.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/zone/command.cpp b/zone/command.cpp index ed551b183..5f4d16aaf 100644 --- a/zone/command.cpp +++ b/zone/command.cpp @@ -7633,7 +7633,7 @@ void command_bestz(Client *c, const Seperator *sep) { if(c->GetTarget()) { z=c->GetTarget()->GetZ(); auto position = xyz_location(c->GetTarget()->GetX(), c->GetTarget()->GetY(), z); - RegionType = zone->watermap->ReturnRegionType(c->GetTarget()->GetX(), c->GetTarget()->GetY(), z); + RegionType = zone->watermap->ReturnRegionType(position); c->Message(0,"InWater returns %d", zone->watermap->InWater(position)); c->Message(0,"InLava returns %d", zone->watermap->InLava(c->GetTarget()->GetX(), c->GetTarget()->GetY(), z)); @@ -7641,7 +7641,7 @@ void command_bestz(Client *c, const Seperator *sep) { else { z=c->GetZ(); auto position = xyz_location(c->GetX(), c->GetY(), z); - RegionType = zone->watermap->ReturnRegionType(c->GetX(), c->GetY(), z); + RegionType = zone->watermap->ReturnRegionType(position); c->Message(0,"InWater returns %d", zone->watermap->InWater(position)); c->Message(0,"InLava returns %d", zone->watermap->InLava(c->GetX(), c->GetY(), z)); diff --git a/zone/water_map.h b/zone/water_map.h index 0e5ccc141..6d5b70443 100644 --- a/zone/water_map.h +++ b/zone/water_map.h @@ -25,7 +25,7 @@ public: ~WaterMap() { } static WaterMap* LoadWaterMapfile(std::string zone_name); - virtual WaterRegionType ReturnRegionType(float y, float x, float z) const { return RegionTypeNormal; } + 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 InLava(float y, float x, float z) const { return false; }