Core/Misc: Fix some typos

6 files changed, 12 insertions, 11 deletions

diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index 84776a121b2..b59220ec53f 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -172,7 +172,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_scarlet_miner_cart' WHERE `entr
 UPDATE `creature_template` SET `ScriptName`='npc_scarlet_miner' WHERE `entry`=28841;
 UPDATE `creature_template` SET `ScriptName`='npc_crusade_persuaded' WHERE `entry` IN (28939,28940,28610);
 UPDATE `creature_template` SET `ScriptName`='mob_scarlet_courier' WHERE `entry`=29076;
-UPDATE `creature_template` SET `AIName`='ArchorAI', `ScriptName`='' WHERE `entry` IN (29102,29103);
+UPDATE `creature_template` SET `AIName`='ArcherAI', `ScriptName`='' WHERE `entry` IN (29102,29103);
 UPDATE `creature_template` SET `AIName`='TurretAI', `ScriptName`='' WHERE `entry`=29104;
 UPDATE `creature_template` SET `ScriptName`='npc_highlord_darion_mograine' WHERE `entry`=29173;
 UPDATE `creature_template` SET `ScriptName`='npc_the_lich_king_tirion_dawn' WHERE `entry` IN (29183,29175);
diff --git a/sql/updates/world/2011_06_10_05_world_creature_template.sql b/sql/updates/world/2011_06_10_05_world_creature_template.sql
new file mode 100644
index 00000000000..17103a3d961
--- /dev/null
+++ b/sql/updates/world/2011_06_10_05_world_creature_template.sql
@@ -0,0 +1 @@
+UPDATE `creature_template` SET `AIName` = 'ArcherAI' WHERE `AIName` = 'ArchorAI';
diff --git a/src/server/game/AI/CoreAI/CombatAI.cpp b/src/server/game/AI/CoreAI/CombatAI.cpp
index e3f2e7b9cfe..b05973a580a 100755
--- a/src/server/game/AI/CoreAI/CombatAI.cpp
+++ b/src/server/game/AI/CoreAI/CombatAI.cpp
@@ -44,7 +44,7 @@ int CombatAI::Permissible(const Creature * /*creature*/)
     return PERMIT_BASE_NO;
 }
 
-int ArchorAI::Permissible(const Creature * /*creature*/)
+int ArcherAI::Permissible(const Creature * /*creature*/)
 {
     return PERMIT_BASE_NO;
 }
@@ -174,13 +174,13 @@ void CasterAI::UpdateAI(const uint32 diff)
 }
 
 //////////////
-//ArchorAI
+//ArcherAI
 //////////////
 
-ArchorAI::ArchorAI(Creature *c) : CreatureAI(c)
+ArcherAI::ArcherAI(Creature *c) : CreatureAI(c)
 {
     if (!me->m_spells[0])
-        sLog->outError("ArchorAI set for creature (entry = %u) with spell1=0. AI will do nothing", me->GetEntry());
+        sLog->outError("ArcherAI set for creature (entry = %u) with spell1=0. AI will do nothing", me->GetEntry());
 
     m_minRange = GetSpellMinRange(me->m_spells[0], false);
     if (!m_minRange)
@@ -189,7 +189,7 @@ ArchorAI::ArchorAI(Creature *c) : CreatureAI(c)
     me->m_SightDistance = me->m_CombatDistance;
 }
 
-void ArchorAI::AttackStart(Unit *who)
+void ArcherAI::AttackStart(Unit *who)
 {
     if (!who)
         return;
@@ -209,7 +209,7 @@ void ArchorAI::AttackStart(Unit *who)
         me->GetMotionMaster()->MoveIdle();
 }
 
-void ArchorAI::UpdateAI(const uint32 /*diff*/)
+void ArcherAI::UpdateAI(const uint32 /*diff*/)
 {
     if (!UpdateVictim())
         return;
diff --git a/src/server/game/AI/CoreAI/CombatAI.h b/src/server/game/AI/CoreAI/CombatAI.h
index 6e8f195282c..97db76252f7 100755
--- a/src/server/game/AI/CoreAI/CombatAI.h
+++ b/src/server/game/AI/CoreAI/CombatAI.h
@@ -64,10 +64,10 @@ class CasterAI : public CombatAI
         float m_attackDist;
 };
 
-struct ArchorAI : public CreatureAI
+struct ArcherAI : public CreatureAI
 {
     public:
-        explicit ArchorAI(Creature *c);
+        explicit ArcherAI(Creature *c);
         void AttackStart(Unit *who);
         void UpdateAI(const uint32 diff);
 
diff --git a/src/server/game/AI/CreatureAIRegistry.cpp b/src/server/game/AI/CreatureAIRegistry.cpp
index 3f97135db64..003ead34236 100755
--- a/src/server/game/AI/CreatureAIRegistry.cpp
+++ b/src/server/game/AI/CreatureAIRegistry.cpp
@@ -45,7 +45,7 @@ namespace AIRegistry
         (new CreatureAIFactory<PetAI>("PetAI"))->RegisterSelf();
         (new CreatureAIFactory<TotemAI>("TotemAI"))->RegisterSelf();
         (new CreatureAIFactory<CombatAI>("CombatAI"))->RegisterSelf();
-        (new CreatureAIFactory<ArchorAI>("ArchorAI"))->RegisterSelf();
+        (new CreatureAIFactory<ArcherAI>("ArcherAI"))->RegisterSelf();
         (new CreatureAIFactory<TurretAI>("TurretAI"))->RegisterSelf();
         (new CreatureAIFactory<CreatureEventAI>("EventAI"))->RegisterSelf();
         (new CreatureAIFactory<AOEAI>("AOEAI"))->RegisterSelf();
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index f84271778b7..f59d6cf3231 100755
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -4030,7 +4030,7 @@ void SpellMgr::LoadSpellCustomAttr()
         // The above situation causes the visual for this spell to be bugged, so we remove the instakill
         // effect and implement a script hack for that.
             spellInfo->Effect[EFFECT_1] = 0;
-            count++;
+            ++count;
             break;
         // ENDOF ULDUAR SPELLS
         //