Changeset 78 for trunk/src/game/WorldSocket.cpp

Timestamp:

11/19/08 13:32:10 (17 years ago)

Author:

yumileroy

Message:

[svn] * fixed help for subcommands - source mangos
* Renamed accounts column tbc to expansion and it only took a little over 4 hours o.O

Original author: KingPin?
Date: 2008-10-20 12:23:56-05:00

Files:

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

trunk/src/game/WorldSocket.cpp

@@ -679 +679 @@
   uint32 BuiltNumberClient;
   uint32 id, security;
-  bool tbc = false;
+  uint8 expansion = 0;
   LocaleConstant locale;
   std::string account;
@@ -729 +729 @@
                                 "v, " //6
                                 "s, " //7
-                                "tbc, " //8
+                                "expansion, " //8
                                 "mutetime, " //9
                                 "locale " //10
@@ -750 +750 @@
   Field* fields = result->Fetch ();
 
-  tbc = fields[8].GetUInt8 () && sWorld.getConfig (CONFIG_EXPANSION) > 0;
+    uint8 expansion = fields[8].GetUInt8();
+    uint32 world_expansion = sWorld.getConfig(CONFIG_EXPANSION);
+    if(expansion > world_expansion)
+        expansion = world_expansion;
 
   N.SetHexStr ("894B645E89E1535BBDAD5B8B290650530801B18EBFBF5E8FAB3C82872A3E9BB7");
@@ -910 +913 @@
   // TODO protect here probably ?
   // Althought atm the socket is singlethreaded
-  ACE_NEW_RETURN (m_Session, WorldSession (id, this, security, tbc, mutetime, locale), -1);
+  ACE_NEW_RETURN (m_Session, WorldSession (id, this, security, expansion, mutetime, locale), -1);
 
   m_Crypt.SetKey (&K);