Merge [SD2]

r1114 Added two new struct ObjectDistanceOrder/ObjectDistanceOrderReversed for generic use sorting objects by GetDistanceOrder()
r1115 Remove obsolete code in misc scripts and use struct ObjectDistanceOrder/Reversed instead
r1116 Added script for mob 24079 + related instance script - skip (already have it better)
r1117 Update DoPlaySoundToSet function and allow WorldObject as source for sound.
r1118 Correcting end bosses scripts in SM cathedral
r1119 Added basic scripts w/texts for bosses in utgarde keep

--HG--
branch : trunk

2 files changed, 3 insertions, 3 deletions

diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp
index c80f55fc0f5..0ed59db42bf 100644
--- a/src/bindings/scripts/include/sc_creature.cpp
+++ b/src/bindings/scripts/include/sc_creature.cpp
@@ -174,14 +174,14 @@ void ScriptedAI::DoWhisper(const char* text, Unit* reciever, bool IsBossWhisper)
     m_creature->MonsterWhisper(text, reciever->GetGUID(), IsBossWhisper);
 }
 
-void ScriptedAI::DoPlaySoundToSet(Unit* pSource, uint32 uiSoundId)
+void ScriptedAI::DoPlaySoundToSet(WorldObject* pSource, uint32 uiSoundId)
 {
     if (!pSource)
         return;
 
     if (!GetSoundEntriesStore()->LookupEntry(uiSoundId))
     {
-        error_log("TSCR: Invalid soundId %u used in DoPlaySoundToSet (by unit TypeId %u, guid %u)", uiSoundId, pSource->GetTypeId(), pSource->GetGUID());
+        error_log("TSCR: Invalid soundId %u used in DoPlaySoundToSet (Source: TypeId %u, GUID %u)", uiSoundId, pSource->GetTypeId(), pSource->GetGUIDLow());
         return;
     }
 
diff --git a/src/bindings/scripts/include/sc_creature.h b/src/bindings/scripts/include/sc_creature.h
index 666ec1fad44..e4142780443 100644
--- a/src/bindings/scripts/include/sc_creature.h
+++ b/src/bindings/scripts/include/sc_creature.h
@@ -143,7 +143,7 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI
     void DoWhisper(const char* text, Unit* reciever, bool IsBossWhisper = false);
 
     //Plays a sound to all nearby players
-    void DoPlaySoundToSet(Unit* unit, uint32 sound);
+    void DoPlaySoundToSet(WorldObject* pSource, uint32 sound);
 
     //Drops all threat to 0%. Does not remove players from the threat list
     void DoResetThreat();