From b444b4b503303f4c2d48e95880d27e73bbfbce92 Mon Sep 17 00:00:00 2001 From: FateJH Date: Sun, 9 Oct 2016 00:22:04 -0400 Subject: [PATCH] changed last field to boolean --- .../scala/net/psforever/packet/game/FriendsResponse.scala | 4 ++-- common/src/test/scala/GamePacketTest.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/src/main/scala/net/psforever/packet/game/FriendsResponse.scala b/common/src/main/scala/net/psforever/packet/game/FriendsResponse.scala index 402f194d..611c2541 100644 --- a/common/src/main/scala/net/psforever/packet/game/FriendsResponse.scala +++ b/common/src/main/scala/net/psforever/packet/game/FriendsResponse.scala @@ -13,7 +13,7 @@ import scodec.codecs._ */ final case class FriendsResponse(player_guid : PlanetSideGUID, friend : String, - unk : Int) + unk : Boolean) extends PlanetSideGamePacket { type Packet = FriendsResponse def opcode = GamePacketOpcode.FriendsResponse @@ -24,6 +24,6 @@ object FriendsReponse extends Marshallable[FriendsResponse] { implicit val codec : Codec[FriendsResponse] = ( ("player_guid" | PlanetSideGUID.codec) :: ("friend" | PacketHelpers.specSizeWideStringAligned(uint(5), 3)) :: - ("unk" | uint8L) + ("unk" | bool) ).as[FriendsResponse] } diff --git a/common/src/test/scala/GamePacketTest.scala b/common/src/test/scala/GamePacketTest.scala index a90801fd..671983b4 100644 --- a/common/src/test/scala/GamePacketTest.scala +++ b/common/src/test/scala/GamePacketTest.scala @@ -839,14 +839,14 @@ class GamePacketTest extends Specification { player_guid mustEqual PlanetSideGUID(35937) friend.length mustEqual 12 friend mustEqual "KurtHectic-G" - unk mustEqual 0 + unk mustEqual false case default => ko } } "encode" in { - val msg = FriendsResponse(PlanetSideGUID(35937), "KurtHectic-G", 0) + val msg = FriendsResponse(PlanetSideGUID(35937), "KurtHectic-G", false) val pkt = PacketCoding.EncodePacket(msg).require.toByteVector pkt mustEqual string