diff options
| -rw-r--r-- | src/game/AccountMgr.cpp | 4 | ||||
| -rw-r--r-- | src/game/Chat.cpp | 4 | ||||
| -rw-r--r-- | src/game/ObjectMgr.cpp | 1 | ||||
| -rw-r--r-- | src/game/World.cpp | 4 | ||||
| -rw-r--r-- | src/game/WorldSocket.cpp | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/src/game/AccountMgr.cpp b/src/game/AccountMgr.cpp index 5deae7a75f9..2051f3c9290 100644 --- a/src/game/AccountMgr.cpp +++ b/src/game/AccountMgr.cpp @@ -18,9 +18,9 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "AccountAccessor.h" +#include "AccountMgr.h" #include "Database/DatabaseEnv.h" -#include "ObjectMgr.h" +#include "ObjectAccessor.h" #include "Player.h" #include "Policies/SingletonImp.h" #include "Util.h" diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp index 1ade86026fa..ff16e2d6e18 100644 --- a/src/game/Chat.cpp +++ b/src/game/Chat.cpp @@ -633,7 +633,7 @@ bool ChatHandler::ExecuteCommandInTable(ChatCommand *table, const char* text, st 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; // select subcommand from child commands list @@ -721,7 +721,7 @@ bool ChatHandler::ShowHelpForSubCommands(ChatCommand *table, char const* cmd, ch if(m_session->GetSecurity() < table[i].SecurityLevel) continue; - if( !hasStringAbbr(table[i].Name, subcmd) ) + if( *subcmd && !hasStringAbbr(table[i].Name, subcmd)) continue; (list += "\n ") += table[i].Name; diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 653049f5256..a93f21af369 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -320,7 +320,6 @@ void ObjectMgr::SendAuctionWonMail( AuctionEntry *auction ) else { bidder_accId = GetPlayerAccountIdByGUID(bidder_guid); - bidder_security = GetSecurityByAccount(bidder_accId); bidder_security = accmgr.GetSecurity(bidder_accId); if(bidder_security > SEC_PLAYER ) // not do redundant DB requests diff --git a/src/game/World.cpp b/src/game/World.cpp index 93cb249aef7..7abba291c86 100644 --- a/src/game/World.cpp +++ b/src/game/World.cpp @@ -229,7 +229,7 @@ World::AddSession_ (WorldSession* s) 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 + packet << uint8 (s->Expansion () ? 1 : 0); // 0 - normal, 1 - TBC, must be set in database manually for each account s->SendPacket (&packet); UpdateMaxSessionCounters (); @@ -266,7 +266,7 @@ void World::AddQueuedPlayer(WorldSession* sess) 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 << 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); diff --git a/src/game/WorldSocket.cpp b/src/game/WorldSocket.cpp index 8df89ac40f5..9535c2dcbe6 100644 --- a/src/game/WorldSocket.cpp +++ b/src/game/WorldSocket.cpp @@ -678,7 +678,7 @@ WorldSocket::HandleAuthSession (WorldPacket& recvPacket) uint32 unk2; uint32 BuiltNumberClient; uint32 id, security; - uint8 expansion = 0; + //uint8 expansion = 0; LocaleConstant locale; std::string account; Sha1Hash sha1; |