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

Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x

Browse Source 
Conflicts:
	src/server/collision/Management/MMapManager.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
This commit is contained in:
Rat
2015-03-24 20:01:02 +01:00
parent bc5ebe3d05 3ad7776d50
commit eebc468e62
507 changed files with 43122 additions and 2440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/Instances/InstanceScript.cpp
View File

@@ -191,6 +191,12 @@ void InstanceScript::UpdateDoorState(GameObject* door)
door->SetGoState(open ? GO_STATE_ACTIVE : GO_STATE_READY);
}
BossInfo* InstanceScript::GetBossInfo(uint32 id)
{
ASSERT(id < bosses.size());
return &bosses[id];
}
void InstanceScript::AddObject(Creature* obj, bool add)
{
ObjectInfoMap::const_iterator j = _creatureInfo.find(obj->GetEntry());