pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-11 11:12: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:24:28 -08:00
parent d8692c1dc7
commit 29573d7d19
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/command.cpp
View File

@ -7635,7 +7635,7 @@ void command_bestz(Client *c, const Seperator *sep) {
auto position = xyz_location(c->GetTarget()->GetX(), c->GetTarget()->GetY(), z); auto position = xyz_location(c->GetTarget()->GetX(), c->GetTarget()->GetY(), z);
RegionType = zone->watermap->ReturnRegionType(position); RegionType = zone->watermap->ReturnRegionType(position);
c->Message(0,"InWater returns %d", zone->watermap->InWater(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)); c->Message(0,"InLava returns %d", zone->watermap->InLava(position));
} }
else { else {
@ -7643,7 +7643,7 @@ void command_bestz(Client *c, const Seperator *sep) {
auto position = xyz_location(c->GetX(), c->GetY(), z); auto position = xyz_location(c->GetX(), c->GetY(), z);
RegionType = zone->watermap->ReturnRegionType(position); RegionType = zone->watermap->ReturnRegionType(position);
c->Message(0,"InWater returns %d", zone->watermap->InWater(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)); c->Message(0,"InLava returns %d", zone->watermap->InLava(position));
} }

2
zone/forage.cpp
View File

@ -237,7 +237,7 @@ bool Client::CanFish() {
dest.z = m_Position.m_Z+10; dest.z = m_Position.m_Z+10;
rodPosition.m_Z = zone->zonemap->FindBestZ(dest, nullptr) + 4; 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_lava = zone->watermap->InLava(rodPosition);
bool in_water = zone->watermap->InWater(rodPosition) || zone->watermap->InVWater(rodPosition); 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); //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) { if (in_lava) {

2
zone/water_map.h
View File

@ -28,7 +28,7 @@ public:
virtual WaterRegionType ReturnRegionType(const xyz_location& location) 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 InWater(const xyz_location& location) const { return false; }
virtual bool InVWater(const xyz_location& location) 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 InLava(const xyz_location& location) const { return false; }
virtual bool InLiquid(float y, float x, float z) const { return false; } virtual bool InLiquid(float y, float x, float z) const { return false; }
protected: protected: