Changeset 12 for trunk/src/game

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/game

Files:

• Object.cpp (modified) (1 diff)
• Object.h (modified) (1 diff)
• Player.cpp (modified) (1 diff)
• Player.h (modified) (1 diff)
• debugcmds.cpp (modified) (1 diff)

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;
 }