Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 02:46:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Merge.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-26 20:43:35 -06:00
parent 39c513776c bc54e91aff
commit d3a6900667
24 changed files with 415 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/game/Object.cpp
View File

@@ -1103,19 +1103,42 @@ WorldObject::WorldObject()
m_isActive = false;
}
void WorldObject::setActive(bool isActive)
void WorldObject::SetWorldObject(bool on)
{
// if already in the same activity state as we try to set, do nothing
if(isActive == m_isActive || isType(TYPEMASK_PLAYER))
if(!IsInWorld())
return;
GetMap()->AddObjectToSwitchList(this, on);
}
void WorldObject::setActive( bool on )
{
if(m_isActive==on)
return;
m_isActive = isActive;
if(IsInWorld())
if(GetTypeId() == TYPEID_PLAYER)
return;
bool world = IsInWorld();
Map* map;
if(world)
{
if(isActive)
GetMap()->AddActiveObject(this);
else
GetMap()->RemoveActiveObject(this);
map = GetMap();
if(GetTypeId() == TYPEID_UNIT)
map->RemoveFromActive((Creature*)this);
else if(GetTypeId() == TYPEID_DYNAMICOBJECT)
map->RemoveFromActive((DynamicObject*)this);
}
m_isActive = on;
if(world)
{
if(GetTypeId() == TYPEID_UNIT)
map->AddToActive((Creature*)this);
else if(GetTypeId() == TYPEID_DYNAMICOBJECT)
map->AddToActive((DynamicObject*)this);
}
}
@@ -1540,7 +1563,7 @@ Map const* WorldObject::GetBaseMap() const
void WorldObject::AddObjectToRemoveList()
{
Map* map = GetMap();
Map* map = MapManager::Instance().FindMap(GetMapId(), GetInstanceId());
if(!map)
{
sLog.outError("Object (TypeId: %u Entry: %u GUID: %u) at attempt add to move list not have valid map (Id: %u).",GetTypeId(),GetEntry(),GetGUIDLow(),GetMapId());