aboutsummaryrefslogtreecommitdiff
path: root/src/bindings/scripts
diff options
context:
space:
mode:
authormegamage <none@none>2008-12-07 09:21:12 -0600
committermegamage <none@none>2008-12-07 09:21:12 -0600
commit087f735251a248217627a362f122b671a618729c (patch)
treeed536d747a0d3df828d748af3bdeb231a2fc5d16 /src/bindings/scripts
parentf593c806cb3b20881c5769cc7bcee747384b7c64 (diff)
*Use react state instead of isaggressive. Allow civilian to fight back.
--HG-- branch : trunk
Diffstat (limited to 'src/bindings/scripts')
-rw-r--r--src/bindings/scripts/scripts/creature/mob_event_ai.cpp2
-rw-r--r--src/bindings/scripts/scripts/npc/npcs_special.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp
index c5ec311d310..07307a4f9a2 100644
--- a/src/bindings/scripts/scripts/creature/mob_event_ai.cpp
+++ b/src/bindings/scripts/scripts/creature/mob_event_ai.cpp
@@ -971,7 +971,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI
m_creature->setActive(param1 ? true : false);
break;
case ACTION_T_SET_AGGRESSIVE:
- m_creature->SetAggressive(param1 ? true : false);
+ m_creature->SetReactState(param1);
break;
case ACTION_T_ATTACK_START_PULSE:
AttackStart(m_creature->SelectNearestTarget((float)param1));
diff --git a/src/bindings/scripts/scripts/npc/npcs_special.cpp b/src/bindings/scripts/scripts/npc/npcs_special.cpp
index d762c8803e6..5fc234b7e7a 100644
--- a/src/bindings/scripts/scripts/npc/npcs_special.cpp
+++ b/src/bindings/scripts/scripts/npc/npcs_special.cpp
@@ -840,10 +840,10 @@ struct TRINITY_DLL_DECL npc_steam_tonkAI : public ScriptedAI
m_creature->InitCharmInfo(m_creature);
m_creature->GetCharmInfo()->InitEmptyActionBar(false);
- m_creature->SetAggressive(false);
+ m_creature->SetReactState(REACT_PASSIVE);
}
else
- m_creature->SetAggressive(true);
+ m_creature->SetReactState(REACT_AGGRESSIVE);
}
};
@@ -859,7 +859,7 @@ struct TRINITY_DLL_DECL npc_tonk_mineAI : public ScriptedAI
{
npc_tonk_mineAI(Creature *c) : ScriptedAI(c)
{
- m_creature->SetAggressive(false);
+ m_creature->SetReactState(REACT_PASSIVE);
Reset();
}