stringtable done, can't see data properly

3 files changed, 57 insertions, 42 deletions

diff --git a/packets/classes/stringtable.go b/packets/classes/stringtable.go
index df8e840..64e8496 100644
--- a/packets/classes/stringtable.go
+++ b/packets/classes/stringtable.go
@@ -1,5 +1,39 @@
 package classes
 
-func ParseStringTable() {
+import (
+        "bytes"
 
+        "github.com/pektezol/bitreader"
+)
+
+func ParseStringTable(data []byte) []StringTable {
+        reader := bitreader.Reader(bytes.NewReader(data), true)
+        var stringTables []StringTable
+        numOfTables := reader.TryReadInt8()
+        for i := 0; i < int(numOfTables); i++ {
+                var stringTable StringTable
+                stringTable.TableName = reader.TryReadString()
+                stringTable.NumOfEntries = int16(reader.TryReadInt16())
+                stringTable.EntryName = reader.TryReadString()
+                if reader.TryReadBool() {
+                        stringTable.EntrySize = int16(reader.TryReadInt16())
+                }
+                if reader.TryReadBool() {
+                        stringTable.EntryData = reader.TryReadBytesToSlice(int(stringTable.EntrySize))
+                }
+                if reader.TryReadBool() {
+                        stringTable.NumOfClientEntries = int16(reader.TryReadInt16())
+                }
+                if reader.TryReadBool() {
+                        stringTable.ClientEntryName = reader.TryReadString()
+                }
+                if reader.TryReadBool() {
+                        stringTable.ClientEntrySize = int16(reader.TryReadInt16())
+                }
+                if reader.TryReadBool() {
+                        stringTable.ClientEntryData = reader.TryReadBytesToSlice(int(stringTable.ClientEntrySize))
+                }
+                stringTables = append(stringTables, stringTable)
+        }
+        return stringTables
 }
diff --git a/packets/classes/types.go b/packets/classes/types.go
index 8e630b6..a1a281e 100644
--- a/packets/classes/types.go
+++ b/packets/classes/types.go
@@ -11,18 +11,30 @@ type CmdInfo struct {
 }
 
 type UserCmdInfo struct {
-        CommandNumber int
-        TickCount     int
+        CommandNumber int32
+        TickCount     int32
         ViewAnglesX   float32
         ViewAnglesY   float32
         ViewAnglesZ   float32
         ForwardMove   float32
         SideMove      float32
         UpMove        float32
-        Buttons       int
+        Buttons       int32
         Impulse       byte
         WeaponSelect  int
         WeaponSubtype int
         MouseDx       int16
         MouseDy       int16
 }
+
+type StringTable struct {
+        TableName          string
+        NumOfEntries       int16
+        EntryName          string
+        EntrySize          int16
+        EntryData          []byte
+        NumOfClientEntries int16
+        ClientEntryName    string
+        ClientEntrySize    int16
+        ClientEntryData    []byte
+}
diff --git a/packets/classes/usercmd.go b/packets/classes/usercmd.go
index a3183b6..78e9c58 100644
--- a/packets/classes/usercmd.go
+++ b/packets/classes/usercmd.go
@@ -1,94 +1,63 @@
 package classes
 
 import (
+        "bytes"
+
         "github.com/pektezol/bitreader"
 )
 
-func ParseUserCmdInfo(reader *bitreader.ReaderType, size int) UserCmdInfo {
-        var bitCount int
+func ParseUserCmdInfo(data []byte) UserCmdInfo {
+        reader := bitreader.Reader(bytes.NewReader(data), true)
         var userCmdInfo UserCmdInfo
         if reader.TryReadBool() {
-                userCmdInfo.CommandNumber = int(reader.TryReadInt32())
-                bitCount += 32
+                userCmdInfo.CommandNumber = int32(reader.TryReadInt32())
         }
-        bitCount++
         if reader.TryReadBool() {
-                userCmdInfo.TickCount = int(reader.TryReadInt32())
-                bitCount += 32
+                userCmdInfo.TickCount = int32(reader.TryReadInt32())
         }
-        bitCount++
         if reader.TryReadBool() {
                 userCmdInfo.ViewAnglesX = reader.TryReadFloat32()
-                bitCount += 32
         }
-        bitCount++
         if reader.TryReadBool() {
                 userCmdInfo.ViewAnglesY = reader.TryReadFloat32()
-                bitCount += 32
         }
-        bitCount++
         if reader.TryReadBool() {
                 userCmdInfo.ViewAnglesZ = reader.TryReadFloat32()
-                bitCount += 32
         }
-        bitCount++
         if reader.TryReadBool() {
                 userCmdInfo.ForwardMove = reader.TryReadFloat32()
-                bitCount += 32
         }
-        bitCount++
         if reader.TryReadBool() {
                 userCmdInfo.SideMove = reader.TryReadFloat32()
-                bitCount += 32
         }
-        bitCount++
         if reader.TryReadBool() {
                 userCmdInfo.UpMove = reader.TryReadFloat32()
-                bitCount += 32
         }
-        bitCount++
         if reader.TryReadBool() {
-                userCmdInfo.Buttons = int(reader.TryReadInt32())
-                bitCount += 32
+                userCmdInfo.Buttons = int32(reader.TryReadInt32())
         }
-        bitCount++
         if reader.TryReadBool() {
                 userCmdInfo.Impulse = reader.TryReadInt8()
-                bitCount += 8
         }
-        bitCount++
         if reader.TryReadBool() {
                 value, err := reader.ReadBits(11)
                 if err != nil {
                         panic(err)
                 }
                 userCmdInfo.WeaponSelect = int(value)
-                bitCount += 11
                 if reader.TryReadBool() {
                         value, err := reader.ReadBits(6)
                         if err != nil {
                                 panic(err)
                         }
                         userCmdInfo.WeaponSubtype = int(value)
-                        bitCount += 6
                 }
-                bitCount++
         }
-        bitCount++
         if reader.TryReadBool() {
                 userCmdInfo.MouseDx = int16(reader.TryReadInt16())
-                bitCount += 16
         }
-        bitCount++
         if reader.TryReadBool() {
                 userCmdInfo.MouseDy = int16(reader.TryReadInt16())
-                bitCount += 16
         }
-        bitCount++
-        /*if bitCount > size*8 {
-                //reader.SkipBits(size * 8)
-                return userCmdInfo
-        }*/
-        reader.SkipBits(size*8 - bitCount)
         return userCmdInfo
 }