Changeset 28 for trunk/src/game/SocialMgr.cpp

Timestamp:

11/19/08 13:24:39 (17 years ago)

Author:

yumileroy

Message:

[svn] * Updated to 6743 and 685

Moved language id used by Arena to a higher place to solve conflicts
Added the empty script folders

Original author: Neo2003
Date: 2008-10-09 08:42:22-05:00

Files:

• trunk/src/game/SocialMgr.cpp (modified) (4 diffs)

trunk/src/game/SocialMgr.cpp

@@ -42 +42 @@
 bool PlayerSocial::AddToSocialList(uint32 friend_guid, bool ignore)
 {
-    // prevent list (client-side) overflow
-    if(m_playerSocialMap.size() >= (255-1))
+    // client limit
+    if(m_playerSocialMap.size() >= 50)
         return false;
 
@@ -181 +181 @@
     bool gmInWhoList = sWorld.getConfig(CONFIG_GM_IN_WHO_LIST) || security > SEC_PLAYER;
 
+    PlayerSocialMap::iterator itr = player->GetSocial()->m_playerSocialMap.find(friendGUID);
+    if(itr != player->GetSocial()->m_playerSocialMap.end())
+        friendInfo.Note = itr->second.Note;
+
     // PLAYER see his team only and PLAYER can't see MODERATOR, GAME MASTER, ADMINISTRATOR characters
     // MODERATOR, GAME MASTER, ADMINISTRATOR can see all
@@ -219 +223 @@
     WorldPacket data;
     MakeFriendStatusPacket(result, friend_guid, &data);
+    GetFriendInfo(player, friend_guid, fi);
     switch(result)
     {
+        case FRIEND_ADDED_OFFLINE:
+        case FRIEND_ADDED_ONLINE:
+            data << fi.Note;
+            break;
+    }
+
+    switch(result)
+    {
+        case FRIEND_ADDED_ONLINE:
         case FRIEND_ONLINE:
-            GetFriendInfo(player, friend_guid, fi);
             data << uint8(fi.Status);
             data << uint32(fi.Area);
             data << uint32(fi.Level);
             data << uint32(fi.Class);
-            break;
-        case FRIEND_ADDED_ONLINE:
-            GetFriendInfo(player, friend_guid, fi);
-            data << name;
-            data << uint8(fi.Status);
-            data << uint32(fi.Area);
-            data << uint32(fi.Level);
-            data << uint32(fi.Class);
-            break;
-        case FRIEND_ADDED_OFFLINE:
-            data << name;
             break;
     }
@@ -300 +302 @@
         social->m_playerSocialMap[friend_guid] = FriendInfo(flags, note);
 
-        // prevent list (client-side) overflow
-        if(social->m_playerSocialMap.size() >= 255)
+        // client limit
+        if(social->m_playerSocialMap.size() >= 50)
             break;
     }