From ffa935e7d3cc1129d447918e0219487cf5c58332 Mon Sep 17 00:00:00 2001 From: FateJH Date: Mon, 1 May 2017 21:48:16 -0400 Subject: [PATCH] another constructor --- .../packet/game/TargetingInfoMessage.scala | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/common/src/main/scala/net/psforever/packet/game/TargetingInfoMessage.scala b/common/src/main/scala/net/psforever/packet/game/TargetingInfoMessage.scala index d1cd1b84..58cacd78 100644 --- a/common/src/main/scala/net/psforever/packet/game/TargetingInfoMessage.scala +++ b/common/src/main/scala/net/psforever/packet/game/TargetingInfoMessage.scala @@ -35,10 +35,10 @@ object TargetInfo { */ private def rangedFloat(n : Int) : Float = { ( - (if(n < 0) { + (if(n <= 0) { 0 } - else if(n > 255) { + else if(n >= 255) { 255 } else { @@ -59,6 +59,17 @@ object TargetInfo { val unk2_2 : Float = rangedFloat(unk2) TargetInfo(target_guid, unk1_2, unk2_2) } + + /** + * Overloaded constructor that takes `Integer` values rather than `Float` values and assumes the second `Integer` is zero. + * @param target_guid the target + * @param unk na + * @return a `TargetInfo` object + */ + def apply(target_guid : PlanetSideGUID, unk : Int) : TargetInfo = { + val unk1_2 : Float = rangedFloat(unk) + TargetInfo(target_guid, unk1_2, 0) + } } object TargetingInfoMessage extends Marshallable[TargetingInfoMessage] {