Merge remote-tracking branch 'tc/3.3.5' into 4.3.4
Note: additional hand-picked ports from 6.x to fix build Conflicts: sql/updates/world/2016_02_22_00_world.sql sql/updates/world/2016_02_22_01_world.sql sql/updates/world/2016_02_22_02_world.sql sql/updates/world/2016_03_07_00_world.sql src/server/authserver/Realms/RealmList.cpp src/server/authserver/Realms/RealmList.h src/server/authserver/Server/AuthSession.cpp src/server/game/Accounts/AccountMgr.cpp src/server/game/AuctionHouse/AuctionHouseMgr.cpp src/server/game/Chat/Chat.cpp src/server/game/Conditions/ConditionMgr.cpp src/server/game/Conditions/ConditionMgr.h src/server/game/Entities/Player/Player.cpp src/server/game/Handlers/CharacterHandler.cpp src/server/game/Handlers/MiscHandler.cpp src/server/game/Scripting/ScriptLoader.cpp src/server/game/Scripting/ScriptLoader.h src/server/game/Server/WorldSession.cpp src/server/game/Server/WorldSocket.cpp src/server/game/World/World.cpp src/server/game/World/World.h src/server/scripts/CMakeLists.txt src/server/scripts/Commands/cs_gm.cpp src/server/scripts/Commands/cs_misc.cpp src/server/scripts/Commands/cs_rbac.cpp src/server/scripts/Commands/cs_ticket.cpp src/server/scripts/Commands/cs_wp.cpp src/server/scripts/EasternKingdoms/CMakeLists.txt src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp src/server/scripts/Kalimdor/CMakeLists.txt src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp src/server/scripts/Kalimdor/zone_orgrimmar.cpp src/server/scripts/OutdoorPvP/CMakeLists.txt src/server/scripts/Spells/spell_dk.cpp src/server/scripts/Spells/spell_hunter.cpp src/server/shared/CMakeLists.txt src/server/worldserver/CMakeLists.txt src/server/worldserver/Main.cpp src/tools/mmaps_generator/CMakeLists.txt
This commit is contained in:
commit
65aec5f8f7
143 files changed
+4022
-4094
No files matched your search
+11
-11
@@ -18,7 +18,7 @@
|
||||
#include "Commands.h"
|
||||
#include <zmqpp/message.hpp>
|
||||
|
||||
zmqpp::message& operator>>(zmqpp::message& msg, IPCHeader& header)
|
||||
zmqpp::message& operator>>(zmqpp::message& msg, IPC::Header& header)
|
||||
{
|
||||
msg >> header.Channel;
|
||||
msg >> header.Command;
|
||||
@@ -28,19 +28,19 @@ zmqpp::message& operator>>(zmqpp::message& msg, IPCHeader& header)
|
||||
zmqpp::message& operator>>(zmqpp::message& msg, Battlenet::RealmHandle& realm)
|
||||
{
|
||||
msg >> realm.Region;
|
||||
msg >> realm.Battlegroup;
|
||||
msg >> realm.Index;
|
||||
msg >> realm.Site;
|
||||
msg >> realm.Realm;
|
||||
return msg;
|
||||
}
|
||||
|
||||
zmqpp::message& operator>>(zmqpp::message& msg, Battlenet::Header& header)
|
||||
zmqpp::message& operator>>(zmqpp::message& msg, IPC::BattlenetComm::Header& header)
|
||||
{
|
||||
msg >> header.Ipc;
|
||||
msg >> header.Realm;
|
||||
return msg;
|
||||
}
|
||||
|
||||
zmqpp::message& operator>>(zmqpp::message& msg, Battlenet::ToonHandle& toonHandle)
|
||||
zmqpp::message& operator>>(zmqpp::message& msg, IPC::BattlenetComm::ToonHandle& toonHandle)
|
||||
{
|
||||
msg >> toonHandle.AccountId;
|
||||
msg >> toonHandle.GameAccountId;
|
||||
@@ -49,29 +49,29 @@ zmqpp::message& operator>>(zmqpp::message& msg, Battlenet::ToonHandle& toonHandl
|
||||
return msg;
|
||||
}
|
||||
|
||||
zmqpp::message& operator<<(zmqpp::message& msg, IPCHeader& header)
|
||||
zmqpp::message& operator<<(zmqpp::message& msg, IPC::Header const& header)
|
||||
{
|
||||
msg << header.Channel;
|
||||
msg << header.Command;
|
||||
return msg;
|
||||
}
|
||||
|
||||
zmqpp::message& operator<<(zmqpp::message& msg, Battlenet::RealmHandle& realm)
|
||||
zmqpp::message& operator<<(zmqpp::message& msg, Battlenet::RealmHandle const& realm)
|
||||
{
|
||||
msg << realm.Region;
|
||||
msg << realm.Battlegroup;
|
||||
msg << realm.Index;
|
||||
msg << realm.Site;
|
||||
msg << realm.Realm;
|
||||
return msg;
|
||||
}
|
||||
|
||||
zmqpp::message& operator<<(zmqpp::message& msg, Battlenet::Header& header)
|
||||
zmqpp::message& operator<<(zmqpp::message& msg, IPC::BattlenetComm::Header const& header)
|
||||
{
|
||||
msg << header.Ipc;
|
||||
msg << header.Realm;
|
||||
return msg;
|
||||
}
|
||||
|
||||
zmqpp::message& operator<<(zmqpp::message& msg, Battlenet::ToonHandle& toonHandle)
|
||||
zmqpp::message& operator<<(zmqpp::message& msg, IPC::BattlenetComm::ToonHandle const& toonHandle)
|
||||
{
|
||||
msg << toonHandle.AccountId;
|
||||
msg << toonHandle.GameAccountId;
|
||||
|
||||
Reference in new issue
Block a user