*Merge

--HG--
branch : trunk

2 files changed, 6 insertions, 12 deletions

diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp
index 1d423574f42..aa64a6fcbf1 100644
--- a/src/bindings/scripts/include/sc_creature.cpp
+++ b/src/bindings/scripts/include/sc_creature.cpp
@@ -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();
 }
diff --git a/src/bindings/scripts/include/sc_creature.h b/src/bindings/scripts/include/sc_creature.h
index b0a885643fc..74eea9ad599 100644
--- a/src/bindings/scripts/include/sc_creature.h
+++ b/src/bindings/scripts/include/sc_creature.h
@@ -41,19 +41,9 @@ class SummonList : private std::list<uint64>
         Creature *m_creature;
 };
 
-struct PointMovement
-{
-    uint32 m_uiCreatureEntry;
-    uint32 m_uiPointId;
-    float m_fX;
-    float m_fY;
-    float m_fZ;
-    uint32 m_uiWaitTime;
-};
-
 struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI
 {
-    explicit ScriptedAI(Creature* creature);
+    explicit ScriptedAI(Creature* pCreature);
     ~ScriptedAI() {}
 
     //*************