Changeset 83

Timestamp:

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

Author:

yumileroy

Message:

[svn] * Compile fixes from previous revs.

Original author: KingPin?
Date: 2008-10-20 14:11:58-05:00

Location:

trunk/src/game

Files:

• AccountMgr.cpp (modified) (1 diff)
• Chat.cpp (modified) (2 diffs)
• ObjectMgr.cpp (modified) (1 diff)
• World.cpp (modified) (2 diffs)
• WorldSocket.cpp (modified) (1 diff)

trunk/src/game/AccountMgr.cpp

@@ -19 +19 @@
  */
 
-#include "AccountAccessor.h"
+#include "AccountMgr.h"
 #include "Database/DatabaseEnv.h"
-#include "ObjectMgr.h"
+#include "ObjectAccessor.h"
 #include "Player.h"
 #include "Policies/SingletonImp.h"

trunk/src/game/Chat.cpp

@@ -634 +634 @@
     for(uint32 i = 0; table[i].Name != NULL; i++)
     {
-        if( *subcmd && !hasStringAbbr(table[i].Name, subcmd))
+        if( !hasStringAbbr(table[i].Name, cmd.c_str()) )
             continue;
 
@@ -722 +722 @@
             continue;
 
-        if( !hasStringAbbr(table[i].Name, subcmd) )
+        if( *subcmd && !hasStringAbbr(table[i].Name, subcmd))
             continue;
 

trunk/src/game/ObjectMgr.cpp

@@ -321 +321 @@
         {
             bidder_accId = GetPlayerAccountIdByGUID(bidder_guid);
-            bidder_security = GetSecurityByAccount(bidder_accId);
             bidder_security = accmgr.GetSecurity(bidder_accId);
 

trunk/src/game/World.cpp

@@ -230 +230 @@
   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
+  packet << uint8 (s->Expansion () ? 1 : 0); // 0 - normal, 1 - TBC, must be set in database manually for each account
   s->SendPacket (&packet);
 
@@ -267 +267 @@
     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 << uint8 (sess->Expansion () ? 1 : 0); // 0 - normal, 1 - TBC, must be set in database manually for each account
     packet << uint32(GetQueuePos (sess));
     sess->SendPacket (&packet);

trunk/src/game/WorldSocket.cpp

@@ -679 +679 @@
   uint32 BuiltNumberClient;
   uint32 id, security;
-  uint8 expansion = 0;
+  //uint8 expansion = 0;
   LocaleConstant locale;
   std::string account;