aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Server
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2017-05-13 12:57:55 +0200
committerShauren <shauren.trinity@gmail.com>2017-05-13 12:57:55 +0200
commitda32ff84d6f9b0fa0f346a6331aa81e930d8c5c9 (patch)
tree028a69b7d4907f48ef0d1889ccf195b84a822149 /src/server/game/Server
parentbeb3316089b350a43e917d896e682298df8dcfc0 (diff)
Build fix
Diffstat (limited to 'src/server/game/Server')
-rw-r--r--src/server/game/Server/Packets/BattlefieldPackets.cpp2
-rw-r--r--src/server/game/Server/Packets/BattlegroundPackets.cpp4
-rw-r--r--src/server/game/Server/Packets/MovementPackets.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Server/Packets/BattlefieldPackets.cpp b/src/server/game/Server/Packets/BattlefieldPackets.cpp
index 3ff96098dbd..55d0539385a 100644
--- a/src/server/game/Server/Packets/BattlefieldPackets.cpp
+++ b/src/server/game/Server/Packets/BattlefieldPackets.cpp
@@ -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;
}
diff --git a/src/server/game/Server/Packets/BattlegroundPackets.cpp b/src/server/game/Server/Packets/BattlegroundPackets.cpp
index 59f4bf16bb6..3130464bd27 100644
--- a/src/server/game/Server/Packets/BattlegroundPackets.cpp
+++ b/src/server/game/Server/Packets/BattlegroundPackets.cpp
@@ -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;
diff --git a/src/server/game/Server/Packets/MovementPackets.cpp b/src/server/game/Server/Packets/MovementPackets.cpp
index a6389509b66..ffa5feedade 100644
--- a/src/server/game/Server/Packets/MovementPackets.cpp
+++ b/src/server/game/Server/Packets/MovementPackets.cpp
@@ -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