Changeset 6 for trunk/src/game/World.cpp

Timestamp:

11/19/08 13:22:12 (17 years ago)

Author:

yumileroy

Message:

[svn] * Added ACE for Linux and Windows (Thanks Derex for Linux part and partial Windows part)
* Updated to 6721 and 676
* Fixed TrinityScript? logo
* Version updated to 0.2.6721.676

Original author: Neo2003
Date: 2008-10-04 06:17:19-05:00

Files:

• trunk/src/game/World.cpp (modified) (10 diffs)

trunk/src/game/World.cpp

@@ -22 +22 @@
 
 #include "Common.h"
+//#include "WorldSocket.h"
 #include "Database/DatabaseEnv.h"
 #include "Config/ConfigEnv.h"
@@ -51 +52 @@
 #include "GameEvent.h"
 #include "Database/DatabaseImpl.h"
-#include "WorldSocket.h"
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
@@ -124 +124 @@
 
     if(m_resultQueue) delete m_resultQueue;
+    
+    //TODO free addSessQueue
 }
 
@@ -174 +176 @@
 }
 
-/// Add a session to the session list
 void World::AddSession(WorldSession* s)
 {
-    ASSERT(s);
-
-    WorldSession* old = m_sessions[s->GetAccountId()];
-    m_sessions[s->GetAccountId()] = s;
-
-    // if session already exist, prepare to it deleting at next world update
-    if(old)
-        m_kicked_sessions.insert(old);
-}
-
-int32 World::GetQueuePos(WorldSocket* socket)
+  addSessQueue.add(s);
+}
+
+void
+World::AddSession_ (WorldSession* s)
+{
+  ASSERT (s);
+
+  //NOTE - Still there is race condition in WorldSession* being used in the Sockets
+
+  ///- kick already loaded player with same account (if any) and remove session
+  ///- if player is in loading and want to load again, return
+  if (!RemoveSession (s->GetAccountId ()))
+    {
+      s->KickPlayer ();
+      m_kicked_sessions.insert (s);
+      return;
+    }
+
+  WorldSession* old = m_sessions[s->GetAccountId ()];
+  m_sessions[s->GetAccountId ()] = s;
+
+  // if session already exist, prepare to it deleting at next world update
+  // NOTE - KickPlayer() should be called on "old" in RemoveSession()
+  if (old)
+    m_kicked_sessions.insert (old);
+
+  uint32 Sessions = GetActiveAndQueuedSessionCount ();
+  uint32 pLimit = GetPlayerAmountLimit ();
+  uint32 QueueSize = GetQueueSize (); //number of players in the queue
+  bool inQueue = false;
+  //so we don't count the user trying to 
+  //login as a session and queue the socket that we are using
+  --Sessions;
+
+  if (pLimit > 0 && Sessions >= pLimit && s->GetSecurity () == SEC_PLAYER )
+    {
+      AddQueuedPlayer (s);
+      UpdateMaxSessionCounters ();
+      sLog.outDetail ("PlayerQueue: Account id %u is in Queue Position (%u).", s->GetAccountId (), ++QueueSize);
+      return;
+    }
+  
+  WorldPacket packet(SMSG_AUTH_RESPONSE, 1 + 4 + 1 + 4 + 1);
+  packet << uint8 (AUTH_OK);
+  packet << uint32 (0); // unknown random value...
+  packet << uint8 (0);
+  packet << uint32 (0);
+  packet << uint8 (s->IsTBC () ? 1 : 0); // 0 - normal, 1 - TBC, must be set in database manually for each account
+  s->SendPacket (&packet);
+
+  UpdateMaxSessionCounters ();
+
+  // Updates the population
+  if (pLimit > 0)
+    {
+      float popu = GetActiveSessionCount (); //updated number of users on the server
+      popu /= pLimit;
+      popu *= 2;
+      loginDatabase.PExecute ("UPDATE realmlist SET population = '%f' WHERE id = '%d'", popu, realmID);
+      sLog.outDetail ("Server Population (%f).", popu);
+    }
+}
+
+int32 World::GetQueuePos(WorldSession* sess)
 {
     uint32 position = 1;
 
     for(Queue::iterator iter = m_QueuedPlayer.begin(); iter != m_QueuedPlayer.end(); ++iter, ++position)
-        if((*iter) == socket)
+        if((*iter) == sess)
             return position;
 
@@ -198 +253 @@
 }
 
-void World::AddQueuedPlayer(WorldSocket* socket)
-{
-    m_QueuedPlayer.push_back(socket);
-}
-
-void World::RemoveQueuedPlayer(WorldSocket* socket)
+void World::AddQueuedPlayer(WorldSession* sess)
+{
+    m_QueuedPlayer.push_back (sess);
+    
+    // The 1st SMSG_AUTH_RESPONSE needs to contain other info too.
+    WorldPacket packet (SMSG_AUTH_RESPONSE, 1 + 4 + 1 + 4 + 1);
+    packet << uint8 (AUTH_WAIT_QUEUE);
+    packet << uint32 (0); // unknown random value...
+    packet << uint8 (0);
+    packet << uint32 (0);
+    packet << uint8 (sess->IsTBC () ? 1 : 0); // 0 - normal, 1 - TBC, must be set in database manually for each account
+    packet << uint32(GetQueuePos (sess));
+    sess->SendPacket (&packet);
+    
+    //sess->SendAuthWaitQue (GetQueuePos (sess));
+}
+
+void World::RemoveQueuedPlayer(WorldSession* sess)
 {
     // sessions count including queued to remove (if removed_session set)
@@ -214 +281 @@
     bool decrease_session = true;
 
-    // search socket to remove and count skipped positions
+    // search to remove and count skipped positions
     for(;iter != m_QueuedPlayer.end(); ++iter, ++position)
     {
-        if(*iter==socket)
+        if(*iter==sess)
         {
             Queue::iterator iter2 = iter;
@@ -237 +304 @@
     if( (!m_playerLimit || sessions < m_playerLimit) && !m_QueuedPlayer.empty() )
     {
-        WorldSocket * socket = m_QueuedPlayer.front();
+        WorldSession * socket = m_QueuedPlayer.front();
         socket->SendAuthWaitQue(0);
         m_QueuedPlayer.pop_front();
@@ -1016 +1083 @@
     objmgr.LoadBattleMastersEntry();
 
+    sLog.outString( "Loading GameTeleports..." );
+    objmgr.LoadGameTele();
+
+    sLog.outString( "Loading Npc Text Id..." );
+    objmgr.LoadNpcTextId();                                 // must be after load Creature and NpcText
+
+    sLog.outString( "Loading vendors..." );
+    objmgr.LoadVendors();                                   // must be after load CreatureTemplate and ItemTemplate
+
+    sLog.outString( "Loading trainers..." );
+    objmgr.LoadTrainerSpell();                              // must be after load CreatureTemplate
+
     sLog.outString( "Loading Waypoints..." );
     WaypointMgr.Load();
@@ -2069 +2148 @@
 {
     // session not removed at kick and will removed in next update tick
-    for (Queue::iterator itr = m_QueuedPlayer.begin(); itr != m_QueuedPlayer.end(); ++itr)
-        if(WorldSession* session = (*itr)->GetSession())
-            session->KickPlayer();
+  //TODO here
+//    for (Queue::iterator itr = m_QueuedPlayer.begin(); itr != m_QueuedPlayer.end(); ++itr)
+//        if(WorldSession* session = (*itr)->GetSession())
+//            session->KickPlayer();
 
     m_QueuedPlayer.empty();
@@ -2321 +2401 @@
 void World::UpdateSessions( time_t diff )
 {
+    while(!addSessQueue.empty())
+    {
+      WorldSession* sess = addSessQueue.next ();
+      AddSession_ (sess);
+    }
+        
     ///- Delete kicked sessions at add new session
     for (std::set<WorldSession*>::iterator itr = m_kicked_sessions.begin(); itr != m_kicked_sessions.end(); ++itr)