Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge [SD2]

Browse Source 
r1314 Correct some spellId's and apply SD2 code style
r1315 Correct more spells and apply SD2 code style
r1316 Replace magic number with enum type name UNIT_DYNFLAG_DEAD
r1317 Add support for quest 1249. Patch by jotapdiez
r1318 Move AI's implementation from headers. Original patch/idea by DasBlub
r1319 Convert script related to quest 938 to use followerAI
r1320 Add new virtual function WaypointStart() to escortAI.

--HG--
branch : trunk
This commit is contained in:
Kudlaty
2009-08-16 21:46:31 +02:00
parent 81ee07fa2a
commit 91f3d69edf
20 changed files with 332 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/bindings/scripts/include/sc_creature.cpp
View File

@@ -80,7 +80,11 @@ void SummonList::DespawnAll()
}
}
ScriptedAI::ScriptedAI(Creature* creature) : CreatureAI(creature), m_creature(creature), IsFleeing(false), m_bCombatMovement(true), m_uiEvadeCheckCooldown(2500)
ScriptedAI::ScriptedAI(Creature* pCreature) : CreatureAI(pCreature),
m_creature(pCreature),
IsFleeing(false),
m_bCombatMovement(true),
m_uiEvadeCheckCooldown(2500)
{
HeroicMode = m_creature->GetMap()->IsHeroic();
}

2
src/bindings/scripts/include/sc_creature.h
View File

@@ -43,7 +43,7 @@ class SummonList : private std::list<uint64>
struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI
{
explicit ScriptedAI(Creature* creature);
explicit ScriptedAI(Creature* pCreature);
~ScriptedAI() {}
//*************