diff options
| author | Anubisss <none@none> | 2009-05-19 21:03:43 +0200 |
|---|---|---|
| committer | Anubisss <none@none> | 2009-05-19 21:03:43 +0200 |
| commit | b0ea9c589a0c64d6a5699d3dbce47e43fe7ae14b (patch) | |
| tree | bde7e5e2b00ce1349040937f99b7c09db5a25b5a /src/bindings/scripts/include | |
| parent | e348b671e7cbe8ce328a4bf07c635328a4accb3c (diff) | |
*Merge SD2.
*r968: Adjust some scripts to use SetEquipmentSlots()
*r969: Made a few corrections to EventAI.txt
*r970: Added ScriptedAI function SetCombatMovement() for future use/development.
*r971: Small adjustments to escortAI, remove some useless code and always use current WaitTimer if not already 0 after return to last known waypoint.
*r972: Added support for quest 1651
--HG--
branch : trunk
Diffstat (limited to 'src/bindings/scripts/include')
| -rw-r--r-- | src/bindings/scripts/include/sc_creature.cpp | 7 | ||||
| -rw-r--r-- | src/bindings/scripts/include/sc_creature.h | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp index 6ab54b95428..e22157cd28c 100644 --- a/src/bindings/scripts/include/sc_creature.cpp +++ b/src/bindings/scripts/include/sc_creature.cpp @@ -79,7 +79,7 @@ void SummonList::DespawnAll() } } -ScriptedAI::ScriptedAI(Creature* creature) : CreatureAI(creature), m_creature(creature), IsFleeing(false) +ScriptedAI::ScriptedAI(Creature* creature) : CreatureAI(creature), m_creature(creature), IsFleeing(false), CombatMovement(true) { HeroicMode = m_creature->GetMap()->IsHeroic(); } @@ -607,6 +607,11 @@ void ScriptedAI::SetSheathState(SheathState newState) m_creature->SetByteValue(UNIT_FIELD_BYTES_2, 0, newState); } +void ScriptedAI::SetCombatMovement(bool CombatMove) +{ + CombatMovement = CombatMove; +} + /*void Scripted_NoMovementAI::MoveInLineOfSight(Unit *who) { if( !m_creature->getVictim() && m_creature->canAttack(who) && ( m_creature->IsHostileTo( who )) && who->isInAccessiblePlaceFor(m_creature) ) diff --git a/src/bindings/scripts/include/sc_creature.h b/src/bindings/scripts/include/sc_creature.h index dc1b8f6144f..7ce9e7e18ff 100644 --- a/src/bindings/scripts/include/sc_creature.h +++ b/src/bindings/scripts/include/sc_creature.h @@ -188,6 +188,11 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI void SetEquipmentSlots(bool bLoadDefault, int32 uiMainHand = EQUIP_NO_CHANGE, int32 uiOffHand = EQUIP_NO_CHANGE, int32 uiRanged = EQUIP_NO_CHANGE); void SetSheathState(SheathState newState); + + void SetCombatMovement(bool CombatMove); + + protected: + bool CombatMovement; }; struct TRINITY_DLL_DECL Scripted_NoMovementAI : public ScriptedAI |