Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Build fix

Browse Source
This commit is contained in:
Shauren
2017-05-13 12:57:55 +02:00
parent beb3316089
commit da32ff84d6
6 changed files with 72 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
src/server/game/Handlers/LFGHandler.cpp
View File

@@ -460,19 +460,19 @@ void WorldSession::SendLfgUpdateStatus(lfg::LfgUpdateData const& updateData, boo
GetPlayerInfo().c_str(), updateData.updateType, party ? "true" : "false");
WorldPacket data(SMSG_LFG_UPDATE_STATUS, 1 + 8 + 3 + 2 + 1 + updateData.comment.length() + 4 + 4 + 1 + 1 + 1 + 4 + size);
data.WriteBit(guid[1]);
data.WriteBit(guid[1] != 0);
data.WriteBit(party);
data.WriteBits(size, 24);
data.WriteBit(guid[6]);
data.WriteBit(guid[6] != 0);
data.WriteBit(size > 0); // Extra info
data.WriteBits(updateData.comment.length(), 9);
data.WriteBit(guid[4]);
data.WriteBit(guid[7]);
data.WriteBit(guid[2]);
data.WriteBit(guid[4] != 0);
data.WriteBit(guid[7] != 0);
data.WriteBit(guid[2] != 0);
data.WriteBit(join); // LFG Join
data.WriteBit(guid[0]);
data.WriteBit(guid[3]);
data.WriteBit(guid[5]);
data.WriteBit(guid[0] != 0);
data.WriteBit(guid[3] != 0);
data.WriteBit(guid[5] != 0);
data.WriteBit(queued); // Join the queue
data << uint8(updateData.updateType); // Lfg Update type
@@ -573,29 +573,29 @@ void WorldSession::SendLfgJoinResult(lfg::LfgJoinResultData const& joinData)
data << uint32(queueId); // Queue Id
data << uint8(joinData.state); // Check Value
data << uint32(time(NULL)); // Join date
data.WriteBit(guid[2]);
data.WriteBit(guid[7]);
data.WriteBit(guid[3]);
data.WriteBit(guid[0]);
data.WriteBit(guid[2] != 0);
data.WriteBit(guid[7] != 0);
data.WriteBit(guid[3] != 0);
data.WriteBit(guid[0] != 0);
data.WriteBits(joinData.lockmap.size(), 24);
for (lfg::LfgLockPartyMap::const_iterator it = joinData.lockmap.begin(); it != joinData.lockmap.end(); ++it)
{
ObjectGuid playerGuid = it->first;
data.WriteBit(playerGuid[7]);
data.WriteBit(playerGuid[5]);
data.WriteBit(playerGuid[3]);
data.WriteBit(playerGuid[6]);
data.WriteBit(playerGuid[0]);
data.WriteBit(playerGuid[2]);
data.WriteBit(playerGuid[4]);
data.WriteBit(playerGuid[1]);
data.WriteBit(playerGuid[7] != 0);
data.WriteBit(playerGuid[5] != 0);
data.WriteBit(playerGuid[3] != 0);
data.WriteBit(playerGuid[6] != 0);
data.WriteBit(playerGuid[0] != 0);
data.WriteBit(playerGuid[2] != 0);
data.WriteBit(playerGuid[4] != 0);
data.WriteBit(playerGuid[1] != 0);
data.WriteBits(it->second.size(), 22);
}
data.WriteBit(guid[4]);
data.WriteBit(guid[5]);
data.WriteBit(guid[1]);
data.WriteBit(guid[6]);
data.WriteBit(guid[4] != 0);
data.WriteBit(guid[5] != 0);
data.WriteBit(guid[1] != 0);
data.WriteBit(guid[6] != 0);
for (lfg::LfgLockPartyMap::const_iterator it = joinData.lockmap.begin(); it != joinData.lockmap.end(); ++it)
{
ObjectGuid playerGuid = it->first;
@@ -643,14 +643,14 @@ void WorldSession::SendLfgQueueStatus(lfg::LfgQueueStatusData const& queueData)
ObjectGuid guid = _player->GetGUID();
WorldPacket data(SMSG_LFG_QUEUE_STATUS, 4 + 4 + 4 + 4 + 4 + 4 + 1 + 1 + 1 + 4 + 4 + 4 + 4 + 8);
data.WriteBit(guid[3]);
data.WriteBit(guid[0]);
data.WriteBit(guid[2]);
data.WriteBit(guid[6]);
data.WriteBit(guid[5]);
data.WriteBit(guid[7]);
data.WriteBit(guid[1]);
data.WriteBit(guid[4]);
data.WriteBit(guid[3] != 0);
data.WriteBit(guid[0] != 0);
data.WriteBit(guid[2] != 0);
data.WriteBit(guid[6] != 0);
data.WriteBit(guid[5] != 0);
data.WriteBit(guid[7] != 0);
data.WriteBit(guid[1] != 0);
data.WriteBit(guid[4] != 0);
data.WriteByteSeq(guid[0]);
data << uint8(queueData.tanks); // Tanks needed
@@ -761,20 +761,17 @@ void WorldSession::SendLfgUpdateProposal(lfg::LfgProposal const& proposal)
data << uint32(proposal.id); // Proposal Id
data << uint8(proposal.state); // State
ObjectGuid guid1 = guid;
ObjectGuid guid2 = gguid;
data.WriteBit(guid2[4]);
data.WriteBit(guid1[3]);
data.WriteBit(guid1[7]);
data.WriteBit(guid1[0]);
data.WriteBit(guid2[1]);
data.WriteBit(gguid[4] != 0);
data.WriteBit(guid[3] != 0);
data.WriteBit(guid[7] != 0);
data.WriteBit(guid[0] != 0);
data.WriteBit(gguid[1] != 0);
data.WriteBit(silent);
data.WriteBit(guid1[4]);
data.WriteBit(guid1[5]);
data.WriteBit(guid2[3]);
data.WriteBit(guid[4] != 0);
data.WriteBit(guid[5] != 0);
data.WriteBit(gguid[3] != 0);
data.WriteBits(proposal.players.size(), 23);
data.WriteBit(guid2[7]);
data.WriteBit(gguid[7] != 0);
for (lfg::LfgProposalPlayerContainer::const_iterator it = proposal.players.begin(); it != proposal.players.end(); ++it)
{
@@ -782,8 +779,8 @@ void WorldSession::SendLfgUpdateProposal(lfg::LfgProposal const& proposal)
if (!player.group)
{
data.WriteBit(0);
data.WriteBit(0);
data.WriteBit(false);
data.WriteBit(false);
}
else
{
@@ -796,21 +793,21 @@ void WorldSession::SendLfgUpdateProposal(lfg::LfgProposal const& proposal)
data.WriteBit(it->first == guid);
}
data.WriteBit(guid2[5]);
data.WriteBit(guid1[6]);
data.WriteBit(guid2[2]);
data.WriteBit(guid2[6]);
data.WriteBit(guid1[2]);
data.WriteBit(guid1[1]);
data.WriteBit(guid2[0]);
data.WriteBit(gguid[5] != 0);
data.WriteBit(guid[6] != 0);
data.WriteBit(gguid[2] != 0);
data.WriteBit(gguid[6] != 0);
data.WriteBit(guid[2] != 0);
data.WriteBit(guid[1] != 0);
data.WriteBit(gguid[0] != 0);
data.WriteByteSeq(guid1[5]);
data.WriteByteSeq(guid2[3]);
data.WriteByteSeq(guid2[6]);
data.WriteByteSeq(guid1[6]);
data.WriteByteSeq(guid1[0]);
data.WriteByteSeq(guid2[5]);
data.WriteByteSeq(guid1[1]);
data.WriteByteSeq(guid[5]);
data.WriteByteSeq(gguid[3]);
data.WriteByteSeq(gguid[6]);
data.WriteByteSeq(guid[6]);
data.WriteByteSeq(guid[0]);
data.WriteByteSeq(gguid[5]);
data.WriteByteSeq(guid[1]);
for (lfg::LfgProposalPlayerContainer::const_iterator it = proposal.players.begin(); it != proposal.players.end(); ++it)
{
@@ -818,15 +815,15 @@ void WorldSession::SendLfgUpdateProposal(lfg::LfgProposal const& proposal)
data << uint32(player.role);
}
data.WriteByteSeq(guid2[7]);
data.WriteByteSeq(guid1[4]);
data.WriteByteSeq(guid2[0]);
data.WriteByteSeq(guid2[1]);
data.WriteByteSeq(guid1[2]);
data.WriteByteSeq(guid1[7]);
data.WriteByteSeq(guid2[2]);
data.WriteByteSeq(guid1[3]);
data.WriteByteSeq(guid2[4]);
data.WriteByteSeq(gguid[7]);
data.WriteByteSeq(guid[4]);
data.WriteByteSeq(gguid[0]);
data.WriteByteSeq(gguid[1]);
data.WriteByteSeq(guid[2]);
data.WriteByteSeq(guid[7]);
data.WriteByteSeq(gguid[2]);
data.WriteByteSeq(guid[3]);
data.WriteByteSeq(gguid[4]);
SendPacket(&data);
}

2
src/server/game/Server/Packets/BattlefieldPackets.cpp
View File

@@ -40,7 +40,7 @@ WorldPacket const* WorldPackets::Battlefield::BFMgrQueueInvite::Write()
_worldPacket << int32(MaxLevel);
_worldPacket << int32(MapID);
_worldPacket << uint32(InstanceID);
_worldPacket.WriteBit(Index);
_worldPacket.WriteBit(Index != 0);
_worldPacket.FlushBits();
return &_worldPacket;
}

4
src/server/game/Server/Packets/BattlegroundPackets.cpp
View File

@@ -73,7 +73,7 @@ ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Battleground::PVPLogData:
if (!playerData.Stats.empty())
data.append(playerData.Stats.data(), playerData.Stats.size());
data.WriteBit(playerData.Faction);
data.WriteBit(playerData.Faction != 0);
data.WriteBit(playerData.IsInWorld);
data.WriteBit(playerData.Honor.is_initialized());
data.WriteBit(playerData.PreMatchRating.is_initialized());
@@ -170,7 +170,7 @@ WorldPacket const* WorldPackets::Battleground::BattlefieldStatusActive::Write()
_worldPacket << uint32(Mapid);
_worldPacket << uint32(ShutdownTimer);
_worldPacket << uint32(StartTimer);
_worldPacket.WriteBit(ArenaFaction);
_worldPacket.WriteBit(ArenaFaction != 0);
_worldPacket.WriteBit(LeftEarly);
_worldPacket.FlushBits();
return &_worldPacket;

4
src/server/game/Server/Packets/MovementPackets.cpp
View File

@@ -297,8 +297,8 @@ void WorldPackets::Movement::CommonMovement::WriteCreateObjectSplineDataBlock(::
data << float(1.0f); // DurationModifier
data << float(1.0f); // NextDurationModifier
data.WriteBits(moveSpline.facing.type, 2); // Face
bool HasJumpGravity = data.WriteBit(moveSpline.splineflags & (::Movement::MoveSplineFlag::Parabolic | ::Movement::MoveSplineFlag::Animation)); // HasJumpGravity
bool HasSpecialTime = data.WriteBit((moveSpline.splineflags & ::Movement::MoveSplineFlag::Parabolic) && moveSpline.effect_start_time < moveSpline.Duration()); // HasSpecialTime
bool HasJumpGravity = data.WriteBit(moveSpline.splineflags.parabolic || moveSpline.splineflags.animation); // HasJumpGravity
bool HasSpecialTime = data.WriteBit(moveSpline.splineflags.parabolic && moveSpline.effect_start_time < moveSpline.Duration()); // HasSpecialTime
data.WriteBits(moveSpline.getPath().size(), 16);
data.WriteBits(uint8(moveSpline.spline.mode()), 2); // Mode
data.WriteBit(0); // HasSplineFilter

1
src/server/shared/Realm/RealmList.h
View File

@@ -24,7 +24,6 @@
#include <map>
#include <vector>
#include <unordered_set>
#include <unordered_set>
struct RealmBuildInfo
{

2
src/server/worldserver/RemoteAccess/RASession.cpp
View File

@@ -23,7 +23,7 @@
#include "Log.h"
#include "Util.h"
#include "World.h"
#include <boost/asio/write.hpp>
#include <boost/asio/buffer.hpp>
#include <boost/asio/read_until.hpp>
#include <array>
#include <memory>