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

Timestamp:

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

Author:

yumileroy

Message:

[svn] *Implement new player conditions CONDITION_NO_AURA, CONDITION_ACTIVE_EVENT
* Default behaviour of pets for creatures changed to REACT_DEFENSIVE
* Disallowed sending wrapped items as COD
* Prevent loading and saving single target auras for pet in same way as already implemented for player
* Correctly limit use some flask types to zones.
* Fixed extracting common.MPQ under *nix
* Many small xleanups and fixes.
** mangos merge rev.

TEST REV so be careful of creepy crawly bugs!

Original author: KingPin?
Date: 2008-11-02 16:53:46-06:00

Files:

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

trunk/src/game/WorldSession.cpp

@@ -52 +52 @@
 {
    if (sock)
-     {
-       m_Address = sock->GetRemoteAddress ();
-       sock->AddReference ();
-     }
+   {
+           m_Address = sock->GetRemoteAddress ();
+           sock->AddReference ();
+   }
 }
 
@@ -100 +100 @@
     if (!m_Socket)
         return;
+
     #ifdef TRINITY_DEBUG
+
     // Code for network use statistic
     static uint64 sendPacketCount = 0;
@@ -132 +134 @@
         sendLastPacketBytes = packet->wpos();               // wpos is real written size
     }
-#endif                                                  // !TRINITY_DEBUG
-
-  if (m_Socket->SendPacket (*packet) == -1)
-    {
-      m_Socket->CloseSocket ();
-    }
+
+        #endif                                                  // !TRINITY_DEBUG
+
+        if (m_Socket->SendPacket (*packet) == -1)
+                m_Socket->CloseSocket ();
 }
 
@@ -158 +159 @@
 bool WorldSession::Update(uint32 /*diff*/)
 {
-  if (m_Socket)
-    if (m_Socket->IsClosed ())
-      { 
+  if (m_Socket && m_Socket->IsClosed ())
+  {
         m_Socket->RemoveReference ();
         m_Socket = NULL;
-      }
+  }
   
     WorldPacket *packet;
@@ -396 +396 @@
         ///- Since each account can only have one online character at any given time, ensure all characters for active account are marked as offline
         //No SQL injection as AccountId is uint32
-        CharacterDatabase.PExecute("UPDATE characters SET online = 0 WHERE account = '%u'", GetAccountId());
+        CharacterDatabase.PExecute("UPDATE characters SET online = 0 WHERE account = '%u'",
+                        GetAccountId());
         sLog.outDebug( "SESSION: Sent SMSG_LOGOUT_COMPLETE Message" );
     }
@@ -408 +409 @@
 void WorldSession::KickPlayer()
 {
-  if (m_Socket)
-    {
-      m_Socket->CloseSocket ();
-    }
+        if (m_Socket)
+                m_Socket->CloseSocket ();
 }