Changeset 209 for trunk/src/game/MiscHandler.cpp

Timestamp:

11/19/08 13:46:36 (17 years ago)

Author:

yumileroy

Message:

[svn] Fix some typos.

Original author: megamage
Date: 2008-11-10 17:19:35-06:00

Files:

• trunk/src/game/MiscHandler.cpp (modified) (8 diffs)

trunk/src/game/MiscHandler.cpp

@@ -11 +11 @@
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
@@ -147 +147 @@
     wstrToLower(wguild_name);
 
-    // client send in case not set max level value 100 but Trinity support 255 max level,
+    // client send in case not set max level value 100 but mangos support 255 max level,
     // update it to show GMs with characters after 100 level
     if(level_max >= 100)
@@ -470 +470 @@
     std::string friendName = GetTrinityString(LANG_FRIEND_IGNORE_UNKNOWN);
     std::string friendNote;
-    
+
     recv_data >> friendName;
 
@@ -493 +493 @@
     if(!result)
         return;
-        
+
     uint64 friendGuid = MAKE_NEW_GUID((*result)[0].GetUInt32(), 0, HIGHGUID_PLAYER);
     uint32 team = Player::TeamForRace((*result)[1].GetUInt8());
-    
+
     delete result;
-    
+
     WorldSession * session = sWorld.FindSession(accountId);
     if(!session)
         return;
-        
+
     FriendsResult friendResult = FRIEND_NOT_FOUND;
     if(friendGuid)
@@ -519 +519 @@
             else
                 friendResult = FRIEND_ADDED_OFFLINE;
-                
-        if(!session->GetPlayer()->GetSocial()->AddToSocialList(GUID_LOPART(friendGuid), false))
-        {
-            friendResult = FRIEND_LIST_FULL;
-            sLog.outDebug( "WORLD: %s's friend list is full.", session->GetPlayer()->GetName());
-        }
+
+            if(!session->GetPlayer()->GetSocial()->AddToSocialList(GUID_LOPART(friendGuid), false))
+            {
+                friendResult = FRIEND_LIST_FULL;
+                sLog.outDebug( "WORLD: %s's friend list is full.", session->GetPlayer()->GetName());
+            }
 
             session->GetPlayer()->GetSocial()->SetFriendNote(GUID_LOPART(friendGuid), friendNote);
@@ -577 +577 @@
     if(!result)
         return;
-    
+
     uint64 IgnoreGuid = MAKE_NEW_GUID((*result)[0].GetUInt32(), 0, HIGHGUID_PLAYER);
-    
+
     delete result;
-    
+
     WorldSession * session = sWorld.FindSession(accountId);
     if(!session)
         return;
-        
+
     FriendsResult ignoreResult = FRIEND_IGNORE_NOT_FOUND;
     if(IgnoreGuid)
@@ -591 +591 @@
         if(IgnoreGuid==session->GetPlayer()->GetGUID())              //not add yourself
             ignoreResult = FRIEND_IGNORE_SELF;
-            else if( session->GetPlayer()->GetSocial()->HasIgnore(GUID_LOPART(IgnoreGuid)) )
-                ignoreResult = FRIEND_IGNORE_ALREADY;
+        else if( session->GetPlayer()->GetSocial()->HasIgnore(GUID_LOPART(IgnoreGuid)) )
+            ignoreResult = FRIEND_IGNORE_ALREADY;
         else
         {
             ignoreResult = FRIEND_IGNORE_ADDED;
 
-        // ignore list full
-        if(!session->GetPlayer()->GetSocial()->AddToSocialList(GUID_LOPART(IgnoreGuid), true))
-            ignoreResult = FRIEND_IGNORE_FULL;
+            // ignore list full
+            if(!session->GetPlayer()->GetSocial()->AddToSocialList(GUID_LOPART(IgnoreGuid), true))
+                ignoreResult = FRIEND_IGNORE_FULL;
         }
     }
@@ -794 +794 @@
             (fabs(dz) > atEntry->box_z/2 + delta) )
         {
-            sLog.outDebug("Player '%s' (GUID: %u) too far (1/2 box X: %f 1/2 box Y: %u 1/2 box Z: %u rotate dX: %f rotate dY: %f dZ:%f), ignore Area Trigger ID: %u",
+            sLog.outDebug("Player '%s' (GUID: %u) too far (1/2 box X: %f 1/2 box Y: %f 1/2 box Z: %f rotate dX: %f rotate dY: %f dZ:%f), ignore Area Trigger ID: %u",
                 pl->GetName(), pl->GetGUIDLow(), atEntry->box_x/2, atEntry->box_y/2, atEntry->box_z/2, rotateDx, rotateDy, dz, Trigger_ID);
             return;