Changeset 181 for trunk/src/game/WorldSession.cpp

Timestamp:

11/19/08 13:44:02 (17 years ago)

Author:

yumileroy

Message:

[svn] Merge from Mangos:
3c7ac5bd3e20c33a22ac57c5c3bac23a0798dc9e 2008-10-23 19:06:27
Some endianess related fixes and cleanups. By VladimirMangos?.

Original author: megamage
Date: 2008-11-06 16:10:28-06:00

Files:

• trunk/src/game/WorldSession.cpp (modified) (11 diffs)

trunk/src/game/WorldSession.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
  */
 
@@ -51 +51 @@
 _logoutTime(0), m_playerLoading(false), m_playerLogout(false), m_playerRecentlyLogout(false), m_latency(0)
 {
-   if (sock)
-   {
-           m_Address = sock->GetRemoteAddress ();
-           sock->AddReference ();
-   }
+    if (sock)
+    {
+        m_Address = sock->GetRemoteAddress ();
+        sock->AddReference ();
+    }
 }
 
@@ -62 +62 @@
 {
     ///- unload player if not unloaded
-    if(_player)
-        LogoutPlayer(true);
+    if (_player)
+        LogoutPlayer (true);
 
     /// - If have unclosed socket, close it
-  if (m_Socket)
-    {
-      m_Socket->CloseSocket ();   
-      m_Socket->RemoveReference ();
-      m_Socket = NULL;
+    if (m_Socket)
+    {
+        m_Socket->CloseSocket ();
+        m_Socket->RemoveReference ();
+        m_Socket = NULL;
     }
 
@@ -76 +76 @@
     while(!_recvQueue.empty())
     {
-        WorldPacket *packet = _recvQueue.next();
+        WorldPacket *packet = _recvQueue.next ();
         delete packet;
     }
-    
 }
 
@@ -134 +133 @@
     }
 
-        #endif                                                  // !TRINITY_DEBUG
-
-        if (m_Socket->SendPacket (*packet) == -1)
-                m_Socket->CloseSocket ();
+    #endif                                                  // !MANGOS_DEBUG
+
+    if (m_Socket->SendPacket (*packet) == -1)
+        m_Socket->CloseSocket ();
 }
 
@@ -158 +157 @@
 bool WorldSession::Update(uint32 /*diff*/)
 {
-  if (m_Socket && m_Socket->IsClosed ())
-  {
+    if (m_Socket && m_Socket->IsClosed ())
+    {
         m_Socket->RemoveReference ();
         m_Socket = NULL;
-  }
-  
+    }
+
     WorldPacket *packet;
 
@@ -248 +247 @@
         if (uint64 lguid = GetPlayer()->GetLootGUID())
             DoLootRelease(lguid);
-            
+
         ///- If the player just died before logging out, make him appear as a ghost
         //FIXME: logout must be delayed in case lost connection with client in time of combat
@@ -285 +284 @@
             // give honor to all attackers from set like group case
             for(std::set<Player*>::const_iterator itr = aset.begin(); itr != aset.end(); ++itr)
-                (*itr)->RewardHonor(_player, aset.size(), -1, true);
+                (*itr)->RewardHonor(_player,aset.size());
 
             // give bg rewards and update counters like kill by first from attackers
@@ -403 +402 @@
         //No SQL injection as AccountId is uint32
         CharacterDatabase.PExecute("UPDATE characters SET online = 0 WHERE account = '%u'",
-                        GetAccountId());
+            GetAccountId());
         sLog.outDebug( "SESSION: Sent SMSG_LOGOUT_COMPLETE Message" );
     }
@@ -415 +414 @@
 void WorldSession::KickPlayer()
 {
-        if (m_Socket)
-                m_Socket->CloseSocket ();
+    if (m_Socket)
+        m_Socket->CloseSocket ();
 }
 
@@ -522 +521 @@
      }
  }
- 
-
-
-