1 files changed, 12 insertions, 20 deletions

diff --git a/packets/classes/usercmd.go b/pkg/classes/userCmdInfo.go
index d3328fd..a6d9091 100644
--- a/packets/classes/usercmd.go
+++ b/pkg/classes/userCmdInfo.go
@@ -16,21 +16,21 @@ type UserCmdInfo struct {
         SideMove      float32
         UpMove        float32
         Buttons       int32
-        Impulse       byte
-        WeaponSelect  int
-        WeaponSubtype int
+        Impulse       int8
+        WeaponSelect  int16
+        WeaponSubType int8
         MouseDx       int16
         MouseDy       int16
 }
 
 func ParseUserCmdInfo(data []byte) UserCmdInfo {
         reader := bitreader.Reader(bytes.NewReader(data), true)
-        var userCmdInfo UserCmdInfo
+        userCmdInfo := UserCmdInfo{}
         if reader.TryReadBool() {
-                userCmdInfo.CommandNumber = int32(reader.TryReadInt32())
+                userCmdInfo.CommandNumber = int32(reader.TryReadBits(32))
         }
         if reader.TryReadBool() {
-                userCmdInfo.TickCount = int32(reader.TryReadInt32())
+                userCmdInfo.TickCount = int32(reader.TryReadBits(32))
         }
         if reader.TryReadBool() {
                 userCmdInfo.ViewAnglesX = reader.TryReadFloat32()
@@ -51,30 +51,22 @@ func ParseUserCmdInfo(data []byte) UserCmdInfo {
                 userCmdInfo.UpMove = reader.TryReadFloat32()
         }
         if reader.TryReadBool() {
-                userCmdInfo.Buttons = int32(reader.TryReadInt32())
+                userCmdInfo.Buttons = int32(reader.TryReadBits(32))
         }
         if reader.TryReadBool() {
-                userCmdInfo.Impulse = reader.TryReadInt8()
+                userCmdInfo.Impulse = int8(reader.TryReadBits(8))
         }
         if reader.TryReadBool() {
-                value, err := reader.ReadBits(11)
-                if err != nil {
-                        panic(err)
-                }
-                userCmdInfo.WeaponSelect = int(value)
+                userCmdInfo.WeaponSelect = int16(reader.TryReadBits(11))
                 if reader.TryReadBool() {
-                        value, err := reader.ReadBits(6)
-                        if err != nil {
-                                panic(err)
-                        }
-                        userCmdInfo.WeaponSubtype = int(value)
+                        userCmdInfo.WeaponSubType = int8(reader.TryReadBits(6))
                 }
         }
         if reader.TryReadBool() {
-                userCmdInfo.MouseDx = int16(reader.TryReadInt16())
+                userCmdInfo.MouseDx = int16(reader.TryReadBits(16))
         }
         if reader.TryReadBool() {
-                userCmdInfo.MouseDy = int16(reader.TryReadInt16())
+                userCmdInfo.MouseDy = int16(reader.TryReadBits(16))
         }
         return userCmdInfo
 }