Core: header cleanup, split realmlist, boost compatibility, cotire, remove stormlib/zlib and stormlib/bzip2 and instead use dep sources
This commit is contained in:
1 parent
7fff6c424f
commit
5ff847159c
1243 files changed
+29780
-36517
No files matched your search
@@ -16,42 +16,43 @@
|
||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "WorldSession.h"
|
||||
#include "AccountMgr.h"
|
||||
#include "ArenaTeam.h"
|
||||
#include "ArenaTeamMgr.h"
|
||||
#include "Battleground.h"
|
||||
#include "BattlenetServerManager.h"
|
||||
#include "CalendarMgr.h"
|
||||
#include "CharacterCache.h"
|
||||
#include "Chat.h"
|
||||
#include "Common.h"
|
||||
#include "DatabaseEnv.h"
|
||||
#include "DBCStores.h"
|
||||
#include "GameObject.h"
|
||||
#include "GameTime.h"
|
||||
#include "GitRevision.h"
|
||||
#include "Group.h"
|
||||
#include "Guild.h"
|
||||
#include "GuildFinderMgr.h"
|
||||
#include "GuildMgr.h"
|
||||
#include "Item.h"
|
||||
#include "Language.h"
|
||||
#include "LFGMgr.h"
|
||||
#include "Log.h"
|
||||
#include "Map.h"
|
||||
#include "Metric.h"
|
||||
#include "MotionMaster.h"
|
||||
#include "ObjectAccessor.h"
|
||||
#include "ObjectMgr.h"
|
||||
#include "Opcodes.h"
|
||||
#include "Pet.h"
|
||||
#include "PlayerDump.h"
|
||||
#include "Player.h"
|
||||
#include "QueryCallback.h"
|
||||
#include "PlayerDump.h"
|
||||
#include "QueryHolder.h"
|
||||
#include "ReputationMgr.h"
|
||||
#include "GitRevision.h"
|
||||
#include "ScriptMgr.h"
|
||||
#include "SharedDefines.h"
|
||||
#include "SocialMgr.h"
|
||||
#include "UpdateMask.h"
|
||||
#include "Util.h"
|
||||
#include "World.h"
|
||||
#include "WorldPacket.h"
|
||||
#include "WorldSession.h"
|
||||
#include "Metric.h"
|
||||
#include "BattlenetServerManager.h"
|
||||
|
||||
class LoginQueryHolder : public SQLQueryHolder
|
||||
{
|
||||
@@ -131,7 +132,7 @@ bool LoginQueryHolder::Initialize()
|
||||
|
||||
stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_MAILCOUNT);
|
||||
stmt->setUInt32(0, lowGuid);
|
||||
stmt->setUInt64(1, uint64(time(NULL)));
|
||||
stmt->setUInt64(1, uint64(time(nullptr)));
|
||||
res &= SetPreparedQuery(PLAYER_LOGIN_QUERY_LOAD_MAIL_COUNT, stmt);
|
||||
|
||||
stmt = CharacterDatabase.GetPreparedStatement(CHAR_SEL_CHARACTER_MAILDATE);
|
||||
@@ -709,7 +710,7 @@ void WorldSession::HandleCharDeleteOpcode(WorldPacket& recvData)
|
||||
|
||||
void WorldSession::HandlePlayerLoginOpcode(WorldPacket& recvData)
|
||||
{
|
||||
if (PlayerLoading() || GetPlayer() != NULL)
|
||||
if (PlayerLoading() || GetPlayer() != nullptr)
|
||||
{
|
||||
TC_LOG_ERROR("network", "Player tries to login again, AccountId = %d", GetAccountId());
|
||||
KickPlayer();
|
||||
@@ -780,7 +781,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
|
||||
// "GetAccountId() == db stored account id" checked in LoadFromDB (prevent login not own character using cheating tools)
|
||||
if (!pCurrChar->LoadFromDB(playerGuid, holder))
|
||||
{
|
||||
SetPlayer(NULL);
|
||||
SetPlayer(nullptr);
|
||||
KickPlayer(); // disconnect client, player no set to session and it will not deleted or saved at kick
|
||||
delete pCurrChar; // delete it manually
|
||||
delete holder; // delete all unprocessed queries
|
||||
@@ -1619,12 +1620,11 @@ void WorldSession::HandleEquipmentSetSave(WorldPacket& recvData)
|
||||
std::string iconName;
|
||||
recvData >> iconName;
|
||||
|
||||
EquipmentSet eqSet;
|
||||
|
||||
eqSet.Guid = setGuid;
|
||||
eqSet.Name = name;
|
||||
eqSet.IconName = iconName;
|
||||
eqSet.state = EQUIPMENT_SET_NEW;
|
||||
EquipmentSetInfo::EquipmentSetData eqData;
|
||||
eqData.Guid = setGuid;
|
||||
eqData.SetID = index;
|
||||
eqData.SetName = name;
|
||||
eqData.SetIcon = iconName;
|
||||
|
||||
for (uint32 i = 0; i < EQUIPMENT_SLOT_END; ++i)
|
||||
{
|
||||
@@ -1633,31 +1633,25 @@ void WorldSession::HandleEquipmentSetSave(WorldPacket& recvData)
|
||||
|
||||
// if client sends 0, it means empty slot
|
||||
if (itemGuid.IsEmpty())
|
||||
{
|
||||
eqSet.Items[i] = 0;
|
||||
continue;
|
||||
}
|
||||
|
||||
// equipment manager sends "1" (as raw GUID) for slots set to "ignore" (don't touch slot at equip set)
|
||||
if (itemGuid.GetRawValue() == 1)
|
||||
{
|
||||
// ignored slots saved as bit mask because we have no free special values for Items[i]
|
||||
eqSet.IgnoreMask |= 1 << i;
|
||||
eqData.IgnoreMask |= 1 << i;
|
||||
continue;
|
||||
}
|
||||
|
||||
// some cheating checks
|
||||
Item* item = _player->GetItemByPos(INVENTORY_SLOT_BAG_0, i);
|
||||
if (!item || item->GetGUID() != itemGuid)
|
||||
{
|
||||
eqSet.Items[i] = 0;
|
||||
continue;
|
||||
}
|
||||
|
||||
eqSet.Items[i] = itemGuid.GetCounter();
|
||||
eqData.Pieces[i] = itemGuid;
|
||||
}
|
||||
|
||||
_player->SetEquipmentSet(index, eqSet);
|
||||
_player->SetEquipmentSet(eqData);
|
||||
}
|
||||
|
||||
void WorldSession::HandleEquipmentSetDelete(WorldPacket& recvData)
|
||||
@@ -1713,7 +1707,7 @@ void WorldSession::HandleEquipmentSetUse(WorldPacket& recvData)
|
||||
_player->StoreItem(sDest, uItem, true);
|
||||
}
|
||||
else
|
||||
_player->SendEquipError(msg, uItem, NULL);
|
||||
_player->SendEquipError(msg, uItem, nullptr);
|
||||
|
||||
continue;
|
||||
}
|
||||
@@ -2360,11 +2354,11 @@ void WorldSession::HandleRandomizeCharNameOpcode(WorldPacket& recvData)
|
||||
return;
|
||||
}
|
||||
|
||||
std::string const* name = GetRandomCharacterName(race, gender);
|
||||
std::string const& name = GetRandomCharacterName(race, gender);
|
||||
WorldPacket data(SMSG_RANDOMIZE_CHAR_NAME, 10);
|
||||
data.WriteBit(0); // unk
|
||||
data.WriteBits(name->size(), 7);
|
||||
data.WriteString(*name);
|
||||
data.WriteBits(name.size(), 7);
|
||||
data.WriteString(name);
|
||||
SendPacket(&data);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user