- Fix Linux build (huge thanks to Aokromes for testing as always)

- Some work towards resolving the crash on shutdown by implementing a shutdown task

--HG--
branch : trunk
This commit is contained in:
Machiavelli
2010-08-19 00:13:09 +02:00
parent fb9c6c96c7
commit 3932fc8c83
9 changed files with 38 additions and 23 deletions
@@ -60,7 +60,7 @@ void WorldSession::SendNameQueryOpcode(Player *p)
void WorldSession::SendNameQueryOpcodeFromDB(uint64 guid)
{
m_nameQueryCallbacks.insert(
ACE_Future<QueryResult_AutoPtr> lFutureResult =
CharacterDatabase.AsyncPQuery(
!sWorld.getConfig(CONFIG_DECLINED_NAMES_USED) ?
// ------- Query Without Declined Names --------
@@ -74,9 +74,11 @@ void WorldSession::SendNameQueryOpcodeFromDB(uint64 guid)
// 5 6 7 8 9
"genitive, dative, accusative, instrumental, prepositional "
"FROM characters LEFT JOIN character_declinedname ON characters.guid = character_declinedname.guid WHERE characters.guid = '%u'",
GUID_LOPART(guid))
GUID_LOPART(guid)
);
m_nameQueryCallbacks.insert(lFutureResult);
// CharacterDatabase.AsyncPQuery(&WorldSession::SendNameQueryOpcodeFromDBCallBack, GetAccountId(),
}