Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-17 16:10:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

[svn] * Compile fixes from previous revs.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
KingPin
2008-10-20 14:11:58 -05:00
parent 717cfa01f0
commit 9664e39fa4
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/AccountMgr.cpp
View File

@@ -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"

4
src/game/Chat.cpp
View File

@@ -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;

1
src/game/ObjectMgr.cpp
View File

@@ -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

4
src/game/World.cpp
View File

@@ -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);

2
src/game/WorldSocket.cpp
View File

@@ -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;