mirror of
https://github.com/mangosfour/server.git
synced 2025-12-31 22:37:05 +00:00
BattleGround: removed now unneeded functions
I couldn't remove AddObject and m_bgObjects from code cause it's still needed for buffobjects.. later the poolsystem must be rewritten, so that it'll work for instances too then those objects can be removed (it would be possible to take the eventsystem for those spawns too - but this would be the wrong way to handle it)
This commit is contained in:
balrok
parent
9b7b3b0304
commit
2adf6245c2
2 changed files with 2 additions and 103 deletions
|
|
@ -199,11 +199,8 @@ BattleGround::~BattleGround()
|
|||
{
|
||||
// remove objects and creatures
|
||||
// (this is done automatically in mapmanager update, when the instance is reset after the reset time)
|
||||
int size = m_BgCreatures.size();
|
||||
for(int i = 0; i < size; ++i)
|
||||
DelCreature(i);
|
||||
|
||||
size = m_BgObjects.size();
|
||||
int size = m_BgObjects.size();
|
||||
for(int i = 0; i < size; ++i)
|
||||
DelObject(i);
|
||||
|
||||
|
|
@ -1578,39 +1575,6 @@ void BattleGround::SpawnBGObject(uint64 const& guid, uint32 respawntime)
|
|||
}
|
||||
}
|
||||
|
||||
Creature* BattleGround::AddCreature(uint32 entry, uint32 type, uint32 teamval, float x, float y, float z, float o, uint32 respawntime)
|
||||
{
|
||||
Map * map = MapManager::Instance().FindMap(GetMapId(),GetInstanceID());
|
||||
if (!map)
|
||||
return NULL;
|
||||
|
||||
Creature* pCreature = new Creature;
|
||||
if (!pCreature->Create(objmgr.GenerateLowGuid(HIGHGUID_UNIT), map, PHASEMASK_NORMAL, entry, teamval))
|
||||
{
|
||||
sLog.outError("Can't create creature entry: %u",entry);
|
||||
delete pCreature;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
pCreature->Relocate(x, y, z, o);
|
||||
|
||||
if (!pCreature->IsPositionValid())
|
||||
{
|
||||
sLog.outError("Creature (guidlow %d, entry %d) not added to battleground. Suggested coordinates isn't valid (X: %f Y: %f)",pCreature->GetGUIDLow(),pCreature->GetEntry(),pCreature->GetPositionX(),pCreature->GetPositionY());
|
||||
delete pCreature;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
pCreature->AIM_Initialize();
|
||||
|
||||
//pCreature->SetDungeonDifficulty(0);
|
||||
|
||||
map->Add(pCreature);
|
||||
m_BgCreatures[type] = pCreature->GetGUID();
|
||||
|
||||
return pCreature;
|
||||
}
|
||||
|
||||
void BattleGround::SpawnBGCreature(uint64 const& guid, uint32 respawntime)
|
||||
{
|
||||
Creature* obj = HashMapHolder<Creature>::Find(guid);
|
||||
|
|
@ -1621,10 +1585,7 @@ void BattleGround::SpawnBGCreature(uint64 const& guid, uint32 respawntime)
|
|||
return;
|
||||
if (respawntime == 0)
|
||||
{
|
||||
//obj->SetVisibility(VISIBILITY_ON);
|
||||
obj->Respawn();
|
||||
//obj->SetRespawnTime(0);
|
||||
//objmgr.SaveCreatureRespawnTime(obj->GetGUIDLow(), GetInstanceID(), 0);
|
||||
map->Add(obj);
|
||||
}
|
||||
else
|
||||
|
|
@ -1636,22 +1597,6 @@ void BattleGround::SpawnBGCreature(uint64 const& guid, uint32 respawntime)
|
|||
}
|
||||
}
|
||||
|
||||
bool BattleGround::DelCreature(uint32 type)
|
||||
{
|
||||
if (!m_BgCreatures[type])
|
||||
return true;
|
||||
|
||||
Creature *cr = HashMapHolder<Creature>::Find(m_BgCreatures[type]);
|
||||
if (!cr)
|
||||
{
|
||||
sLog.outError("Can't find creature guid: %u",GUID_LOPART(m_BgCreatures[type]));
|
||||
return false;
|
||||
}
|
||||
cr->AddObjectToRemoveList();
|
||||
m_BgCreatures[type] = 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool BattleGround::DelObject(uint32 type)
|
||||
{
|
||||
if (!m_BgObjects[type])
|
||||
|
|
@ -1669,41 +1614,6 @@ bool BattleGround::DelObject(uint32 type)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool BattleGround::AddSpiritGuide(uint32 type, float x, float y, float z, float o, uint32 team)
|
||||
{
|
||||
uint32 entry = 0;
|
||||
|
||||
if (team == ALLIANCE)
|
||||
entry = 13116;
|
||||
else
|
||||
entry = 13117;
|
||||
|
||||
Creature* pCreature = AddCreature(entry,type,team,x,y,z,o);
|
||||
if (!pCreature)
|
||||
{
|
||||
sLog.outError("Can't create Spirit guide. BattleGround not created!");
|
||||
EndNow();
|
||||
return false;
|
||||
}
|
||||
|
||||
pCreature->setDeathState(DEAD);
|
||||
|
||||
pCreature->SetUInt64Value(UNIT_FIELD_CHANNEL_OBJECT, pCreature->GetGUID());
|
||||
// aura
|
||||
pCreature->SetVisibleAura(0, SPELL_SPIRIT_HEAL_CHANNEL);
|
||||
//pCreature->SetUInt32Value(UNIT_FIELD_AURAFLAGS, 0x00000009);
|
||||
//pCreature->SetUInt32Value(UNIT_FIELD_AURALEVELS, 0x0000003C);
|
||||
//pCreature->SetUInt32Value(UNIT_FIELD_AURAAPPLICATIONS, 0x000000FF);
|
||||
// casting visual effect
|
||||
pCreature->SetUInt32Value(UNIT_CHANNEL_SPELL, SPELL_SPIRIT_HEAL_CHANNEL);
|
||||
// correct cast speed
|
||||
pCreature->SetFloatValue(UNIT_MOD_CAST_SPEED, 1.0f);
|
||||
|
||||
//pCreature->CastSpell(pCreature, SPELL_SPIRIT_HEAL_CHANNEL, true);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void BattleGround::SendMessageToAll(int32 entry, ChatMsg type, Player const* source)
|
||||
{
|
||||
MaNGOS::BattleGroundChatBuilder bg_builder(type, entry, source);
|
||||
|
|
@ -1819,11 +1729,6 @@ uint32 BattleGround::GetPlayerTeam(uint64 guid)
|
|||
return 0;
|
||||
}
|
||||
|
||||
uint32 BattleGround::GetOtherTeam(uint32 teamId)
|
||||
{
|
||||
return (teamId) ? ((teamId == ALLIANCE) ? HORDE : ALLIANCE) : 0;
|
||||
}
|
||||
|
||||
bool BattleGround::IsPlayerInBattleGround(uint64 guid)
|
||||
{
|
||||
BattleGroundPlayerMap::const_iterator itr = m_Players.find(guid);
|
||||
|
|
|
|||
|
|
@ -518,14 +518,10 @@ class BattleGround
|
|||
typedef std::vector<uint64> BGCreatures;
|
||||
// TODO drop m_BGObjects
|
||||
BGObjects m_BgObjects;
|
||||
BGCreatures m_BgCreatures;
|
||||
void SpawnBGObject(uint64 const& guid, uint32 respawntime);
|
||||
bool AddObject(uint32 type, uint32 entry, float x, float y, float z, float o, float rotation0, float rotation1, float rotation2, float rotation3, uint32 respawnTime = 0);
|
||||
void SpawnBGCreature(uint64 const& guid, uint32 respawntime);
|
||||
Creature* AddCreature(uint32 entry, uint32 type, uint32 teamval, float x, float y, float z, float o, uint32 respawntime = 0);
|
||||
bool DelCreature(uint32 type);
|
||||
bool DelObject(uint32 type);
|
||||
bool AddSpiritGuide(uint32 type, float x, float y, float z, float o, uint32 team);
|
||||
|
||||
void DoorOpen(uint64 const& guid);
|
||||
void DoorClose(uint64 const& guid);
|
||||
|
|
@ -534,7 +530,7 @@ class BattleGround
|
|||
|
||||
// since arenas can be AvA or Hvh, we have to get the "temporary" team of a player
|
||||
uint32 GetPlayerTeam(uint64 guid);
|
||||
uint32 GetOtherTeam(uint32 teamId);
|
||||
uint32 GetOtherTeam(uint32 teamId){ return (teamId) ? ((teamId == ALLIANCE) ? HORDE : ALLIANCE) : 0; }
|
||||
bool IsPlayerInBattleGround(uint64 guid);
|
||||
|
||||
void SetDeleteThis() {m_SetDeleteThis = true;}
|
||||
|
|
@ -548,8 +544,6 @@ class BattleGround
|
|||
BGCreatures creatures;
|
||||
};
|
||||
|
||||
//typedef std::map<uint8, std::map<uint8, EventObjects>> BGObjectMap;
|
||||
//typedef std::map<uint8, std::map<uint8, bool>> BGEventMap;
|
||||
// cause we create it dynamicly i use a map - to avoid resizing when
|
||||
// using vector - also it contains 2*events concatenated with PAIR32
|
||||
// this is needed to avoid overhead of a 2dimensional std::map
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue