*Merge.

--HG--
branch : trunk

2 files changed, 6 insertions, 6 deletions

diff --git a/src/bindings/interface/ScriptMgr.cpp b/src/bindings/interface/ScriptMgr.cpp
index 81e017685d6..3cb45d8170b 100644
--- a/src/bindings/interface/ScriptMgr.cpp
+++ b/src/bindings/interface/ScriptMgr.cpp
@@ -20,11 +20,11 @@
 
 #include "config.h"
 #include "ScriptMgr.h"
-#include "../../game/GossipDef.h"
-#include "../../game/GameObject.h"
-#include "../../game/Player.h"
-#include "../../game/Map.h"
-#include "../../game/ObjectMgr.h"
+#include "GossipDef.h"
+#include "GameObject.h"
+#include "Player.h"
+#include "Map.h"
+#include "ObjectMgr.h"
 
 //uint8 loglevel = 0;
 int nrscripts;
diff --git a/src/bindings/interface/ScriptMgr.h b/src/bindings/interface/ScriptMgr.h
index 3954616d382..97b75f07db2 100644
--- a/src/bindings/interface/ScriptMgr.h
+++ b/src/bindings/interface/ScriptMgr.h
@@ -90,7 +90,7 @@ extern int num_inst_scripts;
 
 struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI
 {
-    ScriptedAI(Creature* creature) : m_creature(creature) {}
+    ScriptedAI(Creature* creature):CreatureAI(creature),m_creature(creature){}
     ~ScriptedAI() {}
 
     // Called if IsVisible(Unit *who) is true at each *who move