josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[7836] Fixes for distance range checks. Author: VladimirMangos

Browse Source 
* ignore 0.0f min range limit (this correct case when 2 object overlapped)

    Also use int32 for temporary store GetSessionDbLocaleIndex result.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-17 10:09:06 -05:00
parent 98e32a041d
commit d99e66d931
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/GridNotifiersImpl.h
+2 -2
View File
@@ -576,7 +576,7 @@ void Trinity::PlayerSearcher<Check>::Visit(PlayerMapType &m)
template<class Builder> template<class Builder>
void MaNGOS::LocalizedPacketDo<Builder>::operator()( Player* p ) void MaNGOS::LocalizedPacketDo<Builder>::operator()( Player* p )
{ {
uint32 loc_idx = p->GetSession()->GetSessionDbLocaleIndex(); int32 loc_idx = p->GetSession()->GetSessionDbLocaleIndex();
uint32 cache_idx = loc_idx+1; uint32 cache_idx = loc_idx+1;
WorldPacket* data; WorldPacket* data;
@@ -601,7 +601,7 @@ void MaNGOS::LocalizedPacketDo<Builder>::operator()( Player* p )
template<class Builder> template<class Builder>
void MaNGOS::LocalizedPacketListDo<Builder>::operator()( Player* p ) void MaNGOS::LocalizedPacketListDo<Builder>::operator()( Player* p )
{ {
uint32 loc_idx = p->GetSession()->GetSessionDbLocaleIndex(); int32 loc_idx = p->GetSession()->GetSessionDbLocaleIndex();
uint32 cache_idx = loc_idx+1; uint32 cache_idx = loc_idx+1;
WorldPacketList* data_list; WorldPacketList* data_list;
src/game/Object.cpp
+21 -9
View File
@@ -1311,9 +1311,13 @@ bool WorldObject::IsInRange(WorldObject const* obj, float minRange, float maxRan
float sizefactor = GetObjectSize() + obj->GetObjectSize(); float sizefactor = GetObjectSize() + obj->GetObjectSize();
float mindist = minRange + sizefactor; // check only for real range
if(distsq < mindist * mindist) if(minRange > 0.0f)
return false; {
float mindist = minRange + sizefactor;
if(distsq < mindist * mindist)
return false;
}
float maxdist = maxRange + sizefactor; float maxdist = maxRange + sizefactor;
return distsq < maxdist * maxdist; return distsq < maxdist * maxdist;
@@ -1327,9 +1331,13 @@ bool WorldObject::IsInRange2d(float x, float y, float minRange, float maxRange)
float sizefactor = GetObjectSize(); float sizefactor = GetObjectSize();
float mindist = minRange + sizefactor; // check only for real range
if(distsq < mindist * mindist) if(minRange > 0.0f)
return false; {
float mindist = minRange + sizefactor;
if(distsq < mindist * mindist)
return false;
}
float maxdist = maxRange + sizefactor; float maxdist = maxRange + sizefactor;
return distsq < maxdist * maxdist; return distsq < maxdist * maxdist;
@@ -1344,9 +1352,13 @@ bool WorldObject::IsInRange3d(float x, float y, float z, float minRange, float m
float sizefactor = GetObjectSize(); float sizefactor = GetObjectSize();
float mindist = minRange + sizefactor; // check only for real range
if(distsq < mindist * mindist) if(minRange > 0.0f)
return false; {
float mindist = minRange + sizefactor;
if(distsq < mindist * mindist)
return false;
}
float maxdist = maxRange + sizefactor; float maxdist = maxRange + sizefactor;
return distsq < maxdist * maxdist; return distsq < maxdist * maxdist;