*Merge.

--HG--
branch : trunk

6 files changed, 7 insertions, 1 deletions

diff --git a/src/bindings/scripts/include/precompiled.cpp b/src/bindings/scripts/include/precompiled.cpp
index faeca72cd2b..75bfae9e1c4 100644
--- a/src/bindings/scripts/include/precompiled.cpp
+++ b/src/bindings/scripts/include/precompiled.cpp
@@ -3,3 +3,4 @@
 * Please see the included DOCS/LICENSE.TXT for more information */
 
 #include "precompiled.h"
+
diff --git a/src/bindings/scripts/include/precompiled.h b/src/bindings/scripts/include/precompiled.h
index ea771653483..28b37a98349 100644
--- a/src/bindings/scripts/include/precompiled.h
+++ b/src/bindings/scripts/include/precompiled.h
@@ -28,3 +28,4 @@ LPVOID lpReserved
 #endif
 
 #endif
+
diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp
index 2d767815dad..04ea6271d9d 100644
--- a/src/bindings/scripts/include/sc_creature.cpp
+++ b/src/bindings/scripts/include/sc_creature.cpp
@@ -843,7 +843,7 @@ void LoadOverridenSQLData()
     // Sunwell Plateau : Kalecgos : Spectral Rift
     goInfo = const_cast<GameObjectInfo*>(GetGameObjectInfo(187055));
     if(goInfo && goInfo->type == GAMEOBJECT_TYPE_GOOBER)
-        goInfo->type = GAMEOBJECT_TYPE_SPELLCASTER;
+        goInfo->goober.lockId = 57; // need LOCKTYPE_QUICK_OPEN
 }
 
 void LoadOverridenDBCData()
@@ -855,3 +855,4 @@ void LoadOverridenDBCData()
     if(spellInfo)
         spellInfo->EffectApplyAuraName[0] = 4; // proc debuff, and summon infinite fiends
 }
+
diff --git a/src/bindings/scripts/include/sc_creature.h b/src/bindings/scripts/include/sc_creature.h
index 30769927501..5639ad0f1ff 100644
--- a/src/bindings/scripts/include/sc_creature.h
+++ b/src/bindings/scripts/include/sc_creature.h
@@ -205,3 +205,4 @@ struct TRINITY_DLL_DECL NullCreatureAI : public ScriptedAI
 };
 
 #endif
+
diff --git a/src/bindings/scripts/include/sc_gossip.h b/src/bindings/scripts/include/sc_gossip.h
index 1bb984f8962..4f3188104eb 100644
--- a/src/bindings/scripts/include/sc_gossip.h
+++ b/src/bindings/scripts/include/sc_gossip.h
@@ -189,3 +189,4 @@ extern uint32 GetSkillLevel(Player *player,uint32 skill);
 
 #define QUEST_DIALOG_STATUS(a,b,c)   GetSession()->getDialogStatus(a,b,c)
 #endif
+
diff --git a/src/bindings/scripts/include/sc_instance.h b/src/bindings/scripts/include/sc_instance.h
index 25be77f876c..2f1cd3a16a6 100644
--- a/src/bindings/scripts/include/sc_instance.h
+++ b/src/bindings/scripts/include/sc_instance.h
@@ -43,3 +43,4 @@ class TRINITY_DLL_DECL ScriptedInstance : public InstanceData
 };
 
 #endif
+