Changeset 12 for trunk

Timestamp:

11/19/08 13:22:59 (17 years ago)

Author:

yumileroy

Message:

[svn] * PlaySound? changed to SendPlaySound?, moved to WorldObject? and used everywhere instead of hard-coding packet

Original author: Neo2003
Date: 2008-10-05 11:38:24-05:00

Location:

trunk/src

Files:

• bindings/scripts/ScriptMgr.cpp (modified) (1 diff)
• bindings/scripts/include/sc_creature.cpp (modified) (2 diffs)
• bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp (modified) (1 diff)
• game/Object.cpp (modified) (1 diff)
• game/Object.h (modified) (1 diff)
• game/Player.cpp (modified) (1 diff)
• game/Player.h (modified) (1 diff)
• game/debugcmds.cpp (modified) (1 diff)

trunk/src/bindings/scripts/ScriptMgr.cpp

@@ -1854 +1854 @@
         if(GetSoundEntriesStore()->LookupEntry((*i).second.SoundId))
         {
-            WorldPacket data(4);
-            data.SetOpcode(SMSG_PLAY_SOUND);
-            data << uint32((*i).second.SoundId);
-            pSource->SendMessageToSet(&data,false);
+            pSource->SendPlaySound((*i).second.SoundId, false);
         }
         else

trunk/src/bindings/scripts/include/sc_creature.cpp

@@ -6 +6 @@
 #include "Item.h"
 #include "Spell.h"
-#include "WorldPacket.h"
 
 // Spell summary for ScriptedAI::SelectSpell
@@ -203 +202 @@
     }
 
-    WorldPacket data(4);
-    data.SetOpcode(SMSG_PLAY_SOUND);
-    data << uint32(sound);
-    unit->SendMessageToSet(&data,false);
+    unit->SendPlaySound(sound, false);
 }
 

trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp

@@ -584 +584 @@
                     switch (rand()%8)
                     {
-                        case 0: (*i)->PlaySound(RND_WISPER_1, true); break;
-                        case 1: (*i)->PlaySound(RND_WISPER_2, true); break;
-                        case 2: (*i)->PlaySound(RND_WISPER_3, true); break;
-                        case 3: (*i)->PlaySound(RND_WISPER_4, true); break;
-                        case 4: (*i)->PlaySound(RND_WISPER_5, true); break;
-                        case 5: (*i)->PlaySound(RND_WISPER_6, true); break;
-                        case 6: (*i)->PlaySound(RND_WISPER_7, true); break;
-                        case 7: (*i)->PlaySound(RND_WISPER_8, true); break;
+                        case 0: (*i)->SendPlaySound(RND_WISPER_1, true); break;
+                        case 1: (*i)->SendPlaySound(RND_WISPER_2, true); break;
+                        case 2: (*i)->SendPlaySound(RND_WISPER_3, true); break;
+                        case 3: (*i)->SendPlaySound(RND_WISPER_4, true); break;
+                        case 4: (*i)->SendPlaySound(RND_WISPER_5, true); break;
+                        case 5: (*i)->SendPlaySound(RND_WISPER_6, true); break;
+                        case 6: (*i)->SendPlaySound(RND_WISPER_7, true); break;
+                        case 7: (*i)->SendPlaySound(RND_WISPER_8, true); break;
                     }
                 }

trunk/src/game/Object.cpp

@@ -1167 +1167 @@
 }
 
+void WorldObject::SendPlaySound(uint32 Sound, bool OnlySelf)
+{
+    WorldPacket data(SMSG_PLAY_SOUND, 4);
+    data << Sound;
+    if (OnlySelf && GetTypeId() == TYPEID_PLAYER )
+        ((Player*)this)->GetSession()->SendPacket( &data );
+    else
+        SendMessageToSet( &data, true ); // ToSelf ignored in this case
+}
+
 namespace MaNGOS
 {

trunk/src/game/Object.h

@@ -438 +438 @@
         virtual bool isVisibleForInState(Player const* u, bool inVisibleList) const = 0;
 
+        // Low Level Packets
+        void SendPlaySound(uint32 Sound, bool OnlySelf);
+
         Map      * GetMap() const;
         Map const* GetBaseMap() const;

trunk/src/game/Player.cpp

@@ -15381 +15381 @@
 }
 
-void Player::PlaySound(uint32 Sound, bool OnlySelf)
-{
-    WorldPacket data(SMSG_PLAY_SOUND, 4);
-    data << Sound;
-    if (OnlySelf)
-        GetSession()->SendPacket( &data );
-    else
-        SendMessageToSet( &data, true );
-}
-
 void Player::SendExplorationExperience(uint32 Area, uint32 Experience)
 {

trunk/src/game/Player.h

@@ -1593 +1593 @@
         void SendLogXPGain(uint32 GivenXP,Unit* victim,uint32 RestXP);
 
-        //Low Level Packets
-        void PlaySound(uint32 Sound, bool OnlySelf);
         //notifiers
         void SendAttackSwingCantAttack();

trunk/src/game/debugcmds.cpp

@@ -217 +217 @@
 
     uint32 soundid = atoi(args);
-    m_session->GetPlayer()->PlaySound(soundid, false);
+    m_session->GetPlayer()->SendPlaySound(soundid, false);
     return true;
 }