Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-30 21:57:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Fix a crash.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-03-03 19:07:52 -06:00
parent aca0f0b497
commit e3eba9331e
4 changed files with 28 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/framework/GameSystem/Grid.h
View File

@@ -60,16 +60,18 @@ class TRINITY_DLL_DECL Grid
/** an object of interested enters the grid
*/
template<class SPECIFIC_OBJECT> bool AddWorldObject(SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl)
template<class SPECIFIC_OBJECT> void AddWorldObject(SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl)
{
return i_objects.template insert<SPECIFIC_OBJECT>(hdl, obj);
if(!i_objects.template insert<SPECIFIC_OBJECT>(hdl, obj))
assert(false);
}
/** an object of interested exits the grid
*/
template<class SPECIFIC_OBJECT> bool RemoveWorldObject(SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl)
template<class SPECIFIC_OBJECT> void RemoveWorldObject(SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl)
{
return i_objects.template remove<SPECIFIC_OBJECT>(obj, hdl);
if(!i_objects.template remove<SPECIFIC_OBJECT>(obj, hdl))
assert(false);
}
/** Accessors: Returns a specific type of object in the WORDL_OBJECT_TYPES
@@ -114,20 +116,18 @@ class TRINITY_DLL_DECL Grid
/** Inserts a container type object into the grid.
*/
template<class SPECIFIC_OBJECT> bool AddGridObject(SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl)
template<class SPECIFIC_OBJECT> void AddGridObject(SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl)
{
//if(obj->isActiveObject())
// m_activeGridObjects.insert(obj);
return i_container.template insert<SPECIFIC_OBJECT>(hdl, obj);
if(!i_container.template insert<SPECIFIC_OBJECT>(hdl, obj))
assert(false);
}
/** Removes a containter type object from the grid
*/
template<class SPECIFIC_OBJECT> bool RemoveGridObject(SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl)
template<class SPECIFIC_OBJECT> void RemoveGridObject(SPECIFIC_OBJECT *obj, OBJECT_HANDLE hdl)
{
//if(obj->isActiveObject())
// m_activeGridObjects.erase(obj);
return i_container.template remove<SPECIFIC_OBJECT>(obj, hdl);
if(!i_container.template remove<SPECIFIC_OBJECT>(obj, hdl))
assert(false);
}
/*bool NoWorldObjectInGrid() const

12
src/game/Map.cpp
View File

@@ -339,19 +339,23 @@ void Map::SwitchGridContainers(T* obj, bool on)
if(on)
{
if(!grid.RemoveGridObject<T>(obj, obj->GetGUID())
grid.RemoveGridObject<T>(obj, obj->GetGUID());
grid.AddWorldObject<T>(obj, obj->GetGUID());
/*if(!grid.RemoveGridObject<T>(obj, obj->GetGUID())
|| !grid.AddWorldObject<T>(obj, obj->GetGUID()))
{
assert(false);
}
}*/
}
else
{
if(!grid.RemoveWorldObject<T>(obj, obj->GetGUID())
grid.RemoveWorldObject<T>(obj, obj->GetGUID());
grid.AddGridObject<T>(obj, obj->GetGUID());
/*if(!grid.RemoveWorldObject<T>(obj, obj->GetGUID())
|| !grid.AddGridObject<T>(obj, obj->GetGUID()))
{
assert(false);
}
}*/
}
obj->IsTempWorldObject = on;
}

2
src/game/Map.h
View File

@@ -372,6 +372,8 @@ class TRINITY_DLL_SPEC Map : public GridRefManager<NGridType>, public Trinity::O
if(m_activeNonPlayersIter != m_activeNonPlayers.end())
{
ActiveNonPlayers::iterator itr = m_activeNonPlayers.find(obj);
if(itr == m_activeNonPlayers.end())
return;
if(itr==m_activeNonPlayersIter)
++m_activeNonPlayersIter;
m_activeNonPlayers.erase(itr);

8
src/game/Unit.cpp
View File

@@ -8526,19 +8526,23 @@ void Unit::SetCharm(Unit* pet)
void Unit::AddPlayerToVision(Player* plr)
{
setActive(true);
if(m_sharedVision.empty())
{
setActive(true);
SetWorldObject(true);
}
m_sharedVision.push_back(plr);
plr->SetFarsightTarget(this);
}
void Unit::RemovePlayerFromVision(Player* plr)
{
setActive(false);
m_sharedVision.remove(plr);
if(m_sharedVision.empty())
{
setActive(false);
SetWorldObject(false);
}
plr->ClearFarsight();
}