From de590cd4e205ce1e71f4d9989ecdf4f4623df23d Mon Sep 17 00:00:00 2001 From: FateJH Date: Mon, 17 Oct 2016 08:49:20 -0400 Subject: [PATCH] fixing a mistaken parameter --- .../psforever/packet/game/TrainingZoneMessage.scala | 13 ++----------- common/src/test/scala/GamePacketTest.scala | 7 ++----- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/common/src/main/scala/net/psforever/packet/game/TrainingZoneMessage.scala b/common/src/main/scala/net/psforever/packet/game/TrainingZoneMessage.scala index 20ba5b38..21885a17 100644 --- a/common/src/main/scala/net/psforever/packet/game/TrainingZoneMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/TrainingZoneMessage.scala @@ -27,14 +27,8 @@ import scodec.codecs._ * 21 - `15` - NC Vehicle Training Area
* 22 - `16` - VS Vehicle Training Area * @param zone the virtual reality zone to send the player - * @param unk1 na; always zero? - * @param unk2 na; always zero? - * @param unk3 na; always zero? */ -final case class TrainingZoneMessage(zone : Int, - unk1 : Int, - unk2 : Int, - unk3 : Int) +final case class TrainingZoneMessage(zone : Long) extends PlanetSideGamePacket { type Packet = TrainingZoneMessage def opcode = GamePacketOpcode.TrainingZoneMessage @@ -43,9 +37,6 @@ final case class TrainingZoneMessage(zone : Int, object TrainingZoneMessage extends Marshallable[TrainingZoneMessage] { implicit val codec : Codec[TrainingZoneMessage] = ( - ("zone" | uint8L) :: - ("unk1" | uint8L) :: - ("unk2" | uint8L) :: - ("unk3" | uint8L) + "zone" | uint32L ).as[TrainingZoneMessage] } diff --git a/common/src/test/scala/GamePacketTest.scala b/common/src/test/scala/GamePacketTest.scala index 168f5bf2..3aab6ca3 100644 --- a/common/src/test/scala/GamePacketTest.scala +++ b/common/src/test/scala/GamePacketTest.scala @@ -835,18 +835,15 @@ class GamePacketTest extends Specification { "decode" in { PacketCoding.DecodePacket(string).require match { - case TrainingZoneMessage(zone, unk1, unk2, unk3) => + case TrainingZoneMessage(zone) => zone mustEqual 19 - unk1 mustEqual 0 - unk2 mustEqual 0 - unk3 mustEqual 0 case default => ko } } "encode" in { - val msg = TrainingZoneMessage(19, 0, 0, 0) + val msg = TrainingZoneMessage(19) val pkt = PacketCoding.EncodePacket(msg).require.toByteVector pkt mustEqual string