aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Custom
diff options
context:
space:
mode:
authorclick <none@none>2010-07-19 14:17:30 +0200
committerclick <none@none>2010-07-19 14:17:30 +0200
commitba36f1eb23885260a832a41e9264b74881c8d285 (patch)
tree89e6eed8a2f2aa7dc51fbe7e4d7d627c1cc67a38 /src/server/scripts/Custom
parent84c6fa001ccbe8b2ce5ae2f1a756c7ba2fbfe36f (diff)
Clean up old (and partially unused) Aggro() function and use EnterCombat() instead + fix some minor enum-typos (INTURRUPT -> INTERRUPT)
(fix by Azazel) --HG-- branch : trunk
Diffstat (limited to 'src/server/scripts/Custom')
-rwxr-xr-xsrc/server/scripts/Custom/custom_example.cpp2
-rwxr-xr-xsrc/server/scripts/Custom/test.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Custom/custom_example.cpp b/src/server/scripts/Custom/custom_example.cpp
index 9010c958ea9..d922dfed0aa 100755
--- a/src/server/scripts/Custom/custom_example.cpp
+++ b/src/server/scripts/Custom/custom_example.cpp
@@ -91,7 +91,7 @@ struct TRINITY_DLL_DECL custom_exampleAI : public ScriptedAI
//*** HANDLED FUNCTION ***
//Attack Start is called whenever someone hits us.
- void Aggro(Unit *who)
+ void EnterCombat(Unit *who)
{
//Say some stuff
DoSay(SAY_AGGRO,LANG_UNIVERSAL,NULL);
diff --git a/src/server/scripts/Custom/test.cpp b/src/server/scripts/Custom/test.cpp
index 0f5dec744b0..0e841d450ba 100755
--- a/src/server/scripts/Custom/test.cpp
+++ b/src/server/scripts/Custom/test.cpp
@@ -87,7 +87,7 @@ struct TRINITY_DLL_DECL npc_testAI : public npc_escortAI
}
}
- void Aggro(Unit*)
+ void EnterCombat(Unit*)
{
if (HasEscortState(STATE_ESCORT_ESCORTING))
me->Say(SAY_AGGRO1, LANG_UNIVERSAL, PlayerGUID);