Backed out changeset: ad4f100c0a9d
--HG-- branch : trunk
This commit is contained in:
+4
-47
@@ -47,16 +47,6 @@ class CharacterHandler;
|
||||
|
||||
#define CHECK_PACKET_SIZE(P,S) if((P).size() < (S)) return SizeError((P),(S));
|
||||
|
||||
#define NUM_ACCOUNT_DATA_TYPES 8
|
||||
|
||||
struct AccountData
|
||||
{
|
||||
AccountData() : Time(NULL), Data("") {}
|
||||
|
||||
time_t Time;
|
||||
std::string Data;
|
||||
};
|
||||
|
||||
enum PartyOperation
|
||||
{
|
||||
PARTY_OP_INVITE = 0,
|
||||
@@ -91,8 +81,6 @@ class TRINITY_DLL_SPEC WorldSession
|
||||
|
||||
void SizeError(WorldPacket const& packet, uint32 size) const;
|
||||
|
||||
void ReadMovementInfo(WorldPacket &data, MovementInfo *mi);
|
||||
|
||||
void SendPacket(WorldPacket const* packet);
|
||||
void SendNotification(const char *format,...) ATTR_PRINTF(2,3);
|
||||
void SendNotification(int32 string_id,...);
|
||||
@@ -165,11 +153,6 @@ class TRINITY_DLL_SPEC WorldSession
|
||||
//pet
|
||||
void SendPetNameQuery(uint64 guid, uint32 petnumber);
|
||||
|
||||
// Account Data
|
||||
AccountData *GetAccountData(uint32 type) { return &m_accountData[type]; }
|
||||
void SetAccountData(uint32 type, time_t time_, std::string data);
|
||||
void LoadAccountData();
|
||||
|
||||
//mail
|
||||
//used with item_page table
|
||||
bool SendItemInfo( uint32 itemid, WorldPacket data );
|
||||
@@ -341,8 +324,7 @@ class TRINITY_DLL_SPEC WorldSession
|
||||
void HandleMovementOpcodes(WorldPacket& recvPacket);
|
||||
void HandlePossessedMovement(WorldPacket& recv_data, MovementInfo& movementInfo, uint32& MovementFlags);
|
||||
void HandleSetActiveMoverOpcode(WorldPacket &recv_data);
|
||||
void HandleMoveNotActiveMover(WorldPacket &recv_data);
|
||||
void HandleDismissControlledVehicle(WorldPacket &recv_data);
|
||||
void HandleNotActiveMoverOpcode(WorldPacket &recv_data);
|
||||
void HandleMoveTimeSkippedOpcode(WorldPacket &recv_data);
|
||||
|
||||
void HandleRequestRaidInfoOpcode( WorldPacket & recv_data );
|
||||
@@ -403,7 +385,7 @@ class TRINITY_DLL_SPEC WorldSession
|
||||
void HandleGuildSaveEmblemOpcode(WorldPacket& recvPacket);
|
||||
|
||||
void HandleTaxiNodeStatusQueryOpcode(WorldPacket& recvPacket);
|
||||
void HandleTaxiQueryAvailableNodes(WorldPacket& recvPacket);
|
||||
void HandleTaxiQueryAvailableNodesOpcode(WorldPacket& recvPacket);
|
||||
void HandleActivateTaxiOpcode(WorldPacket& recvPacket);
|
||||
void HandleActivateTaxiFarOpcode(WorldPacket& recvPacket);
|
||||
void HandleTaxiNextDestinationOpcode(WorldPacket& recvPacket);
|
||||
@@ -447,7 +429,6 @@ class TRINITY_DLL_SPEC WorldSession
|
||||
void HandleAuctionRemoveItem( WorldPacket & recv_data );
|
||||
void HandleAuctionListOwnerItems( WorldPacket & recv_data );
|
||||
void HandleAuctionPlaceBid( WorldPacket & recv_data );
|
||||
void HandleAuctionListPendingSales( WorldPacket & recv_data );
|
||||
|
||||
void HandleGetMail( WorldPacket & recv_data );
|
||||
void HandleSendMail( WorldPacket & recv_data );
|
||||
@@ -562,7 +543,6 @@ class TRINITY_DLL_SPEC WorldSession
|
||||
void HandlePetUnlearnOpcode( WorldPacket& recvPacket );
|
||||
void HandlePetSpellAutocastOpcode( WorldPacket& recvPacket );
|
||||
void HandlePetCastSpellOpcode( WorldPacket& recvPacket );
|
||||
void HandlePetLearnTalent( WorldPacket& recvPacket );
|
||||
|
||||
void HandleSetActionBar(WorldPacket& recv_data);
|
||||
|
||||
@@ -599,9 +579,10 @@ class TRINITY_DLL_SPEC WorldSession
|
||||
void HandleLfmSetNoneOpcode(WorldPacket& recv_data);
|
||||
void HandleLfmSetOpcode(WorldPacket& recv_data);
|
||||
void HandleLfgSetCommentOpcode(WorldPacket& recv_data);
|
||||
void HandleNewUnknownOpcode(WorldPacket& recv_data);
|
||||
void HandleChooseTitleOpcode(WorldPacket& recv_data);
|
||||
void HandleRealmStateRequestOpcode(WorldPacket& recv_data);
|
||||
void HandleTimeSyncResp(WorldPacket& recv_data);
|
||||
void HandleAllowMoveAckOpcode(WorldPacket& recv_data);
|
||||
void HandleWhoisOpcode(WorldPacket& recv_data);
|
||||
void HandleResetInstancesOpcode(WorldPacket& recv_data);
|
||||
|
||||
@@ -647,29 +628,6 @@ class TRINITY_DLL_SPEC WorldSession
|
||||
void HandleGuildBankBuyTab(WorldPacket& recv_data);
|
||||
void HandleGuildBankTabText(WorldPacket& recv_data);
|
||||
void HandleGuildBankSetTabText(WorldPacket& recv_data);
|
||||
|
||||
// Calendar
|
||||
void HandleCalendarGetCalendar(WorldPacket& recv_data);
|
||||
void HandleCalendarGetEvent(WorldPacket& recv_data);
|
||||
void HandleCalendarGuildFilter(WorldPacket& recv_data);
|
||||
void HandleCalendarArenaTeam(WorldPacket& recv_data);
|
||||
void HandleCalendarAddEvent(WorldPacket& recv_data);
|
||||
void HandleCalendarUpdateEvent(WorldPacket& recv_data);
|
||||
void HandleCalendarRemoveEvent(WorldPacket& recv_data);
|
||||
void HandleCalendarCopyEvent(WorldPacket& recv_data);
|
||||
void HandleCalendarEventInvite(WorldPacket& recv_data);
|
||||
void HandleCalendarEventRsvp(WorldPacket& recv_data);
|
||||
void HandleCalendarEventRemoveInvite(WorldPacket& recv_data);
|
||||
void HandleCalendarEventStatus(WorldPacket& recv_data);
|
||||
void HandleCalendarEventModeratorStatus(WorldPacket& recv_data);
|
||||
void HandleCalendarComplain(WorldPacket& recv_data);
|
||||
void HandleCalendarGetNumPending(WorldPacket& recv_data);
|
||||
|
||||
void HandleSpellClick(WorldPacket& recv_data);
|
||||
void HandleAlterAppearance(WorldPacket& recv_data);
|
||||
void HandleRemoveGlyph(WorldPacket& recv_data);
|
||||
void HandleCharCustomize(WorldPacket& recv_data);
|
||||
void HandleInspectAchievements(WorldPacket& recv_data);
|
||||
private:
|
||||
// private trade methods
|
||||
void moveItems(Item* myItems[], Item* hisItems[]);
|
||||
@@ -692,7 +650,6 @@ class TRINITY_DLL_SPEC WorldSession
|
||||
LocaleConstant m_sessionDbcLocale;
|
||||
int m_sessionDbLocaleIndex;
|
||||
uint32 m_latency;
|
||||
AccountData m_accountData[NUM_ACCOUNT_DATA_TYPES];
|
||||
|
||||
ZThread::LockedQueue<WorldPacket*,ZThread::FastMutex> _recvQueue;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user