net/svc messages finally getting parsed correctly

9 files changed, 30 insertions, 28 deletions

diff --git a/packets/messages/message.go b/packets/messages/message.go
index 376a3d5..4a00212 100644
--- a/packets/messages/message.go
+++ b/packets/messages/message.go
@@ -7,15 +7,6 @@ import (
         "github.com/pektezol/demoparser/packets/messages/types"
 )
 
-// TODO: Read data properly in:
-// SvcCreateStringTable
-// SvcGameEventList
-// SvcPacketEntities
-// SvcSounds
-// SvcTempEntities
-// SvcUpdateStringTable
-// SvcUserMessage
-
 func ParseMessage(data []byte) []Message {
         reader := bitreader.Reader(bytes.NewReader(data), true)
         var messages []Message
@@ -24,7 +15,6 @@ func ParseMessage(data []byte) []Message {
                 if err != nil {
                         break
                 }
-                // fmt.Printf("Reading message type: %d\n", messageType)
                 switch messageType {
                 case 0:
                         messages = append(messages, Message{Data: types.NetNop{}})
@@ -77,7 +67,7 @@ func ParseMessage(data []byte) []Message {
                 case 24:
                         messages = append(messages, Message{Data: types.ParseSvcEntityMessage(reader)})
                 case 25:
-                        // TODO: SvcGameEvent
+                        messages = append(messages, Message{Data: types.ParseSvcGameEvent(reader)})
                 case 26:
                         messages = append(messages, Message{Data: types.ParseSvcPacketEntities(reader)})
                 case 27:
diff --git a/packets/messages/types/SvcCreateStringTable.go b/packets/messages/types/SvcCreateStringTable.go
index 336b3e0..72ab1a7 100644
--- a/packets/messages/types/SvcCreateStringTable.go
+++ b/packets/messages/types/SvcCreateStringTable.go
@@ -1,6 +1,8 @@
 package types
 
-import "github.com/pektezol/bitreader"
+import (
+        "github.com/pektezol/bitreader"
+)
 
 type SvcCreateStringTable struct {
         Name              string
@@ -10,7 +12,7 @@ type SvcCreateStringTable struct {
         UserDataSize      uint16
         UserDataSizeBits  uint8
         Flags             uint8
-        StringData        int
+        StringData        []byte
 }
 
 func ParseSvcCreateStringTable(reader *bitreader.ReaderType) SvcCreateStringTable {
@@ -26,8 +28,7 @@ func ParseSvcCreateStringTable(reader *bitreader.ReaderType) SvcCreateStringTabl
                 svccreatestringtable.UserDataSizeBits = uint8(reader.TryReadBits(4))
         }
         svccreatestringtable.Flags = uint8(reader.TryReadBits(2))
-        reader.SkipBits(int(length)) // TODO: Read data properly
-        // svccreatestringtable.StringData = int(reader.TryReadBits(int(length / 8)))
+        svccreatestringtable.StringData = reader.TryReadBitsToSlice(int(length))
         return svccreatestringtable
 
 }
diff --git a/packets/messages/types/SvcGameEvent.go b/packets/messages/types/SvcGameEvent.go
new file mode 100644
index 0000000..1d6b0ea
--- /dev/null
+++ b/packets/messages/types/SvcGameEvent.go
@@ -0,0 +1,15 @@
+package types
+
+import (
+        "github.com/pektezol/bitreader"
+)
+
+type SvcGameEvent struct {
+        Data []byte
+}
+
+func ParseSvcGameEvent(reader *bitreader.ReaderType) SvcGameEvent {
+        length := reader.TryReadBits(11)
+        reader.SkipBits(int(length))
+        return SvcGameEvent{} // TODO: Parse SvcGameEvent
+}
diff --git a/packets/messages/types/SvcGameEventList.go b/packets/messages/types/SvcGameEventList.go
index 3952517..fea0be4 100644
--- a/packets/messages/types/SvcGameEventList.go
+++ b/packets/messages/types/SvcGameEventList.go
@@ -10,9 +10,8 @@ type SvcGameEventList struct {
 func ParseSvcGameEventList(reader *bitreader.ReaderType) SvcGameEventList {
         events := reader.TryReadBits(9)
         length := reader.TryReadBits(20)
-        reader.SkipBits(int(length)) // TODO: Read data properly
         return SvcGameEventList{
                 Events: int16(events),
-                //Data:   reader.TryReadBytesToSlice(int(length)),
+                Data:   reader.TryReadBitsToSlice(int(length)),
         }
 }
diff --git a/packets/messages/types/SvcPacketEntities.go b/packets/messages/types/SvcPacketEntities.go
index 6621c3a..9d8a8b0 100644
--- a/packets/messages/types/SvcPacketEntities.go
+++ b/packets/messages/types/SvcPacketEntities.go
@@ -20,12 +20,13 @@ func ParseSvcPacketEntities(reader *bitreader.ReaderType) SvcPacketEntities {
         var deltafrom int32
         if isdelta {
                 deltafrom = int32(reader.TryReadInt32())
+        } else {
+                deltafrom = -1
         }
         baseline := reader.TryReadBool()
         updatedentries := reader.TryReadBits(11)
         length := reader.TryReadBits(20)
         updatebaseline := reader.TryReadBool()
-        reader.SkipBits(int(length)) // TODO: Read data properly
         return SvcPacketEntities{
                 MaxEntries:     uint16(maxentries),
                 IsDelta:        isdelta,
@@ -33,6 +34,6 @@ func ParseSvcPacketEntities(reader *bitreader.ReaderType) SvcPacketEntities {
                 BaseLine:       baseline,
                 UpdatedEntries: uint16(updatedentries),
                 UpdateBaseline: updatebaseline,
-                // Data:           reader.TryReadBytesToSlice(int(length / 8)),
+                Data:           reader.TryReadBitsToSlice(int(length)),
         }
 }
diff --git a/packets/messages/types/SvcSounds.go b/packets/messages/types/SvcSounds.go
index 4d858bf..2dc7974 100644
--- a/packets/messages/types/SvcSounds.go
+++ b/packets/messages/types/SvcSounds.go
@@ -22,11 +22,9 @@ func ParseSvcSounds(reader *bitreader.ReaderType) SvcSounds {
         } else {
                 length = int16(reader.TryReadInt16())
         }
-        reader.SkipBits(int(length)) // TODO: Read data properly
-        //data := reader.TryReadBytesToSlice(int(length / 8))
         return SvcSounds{
                 ReliableSound: reliablesound,
                 Size:          size,
-                //Data:          data,
+                Data:          reader.TryReadBitsToSlice(int(length)),
         }
 }
diff --git a/packets/messages/types/SvcTempEntities.go b/packets/messages/types/SvcTempEntities.go
index 105e014..3bfae0c 100644
--- a/packets/messages/types/SvcTempEntities.go
+++ b/packets/messages/types/SvcTempEntities.go
@@ -12,9 +12,9 @@ type SvcTempEntities struct {
 func ParseSvcTempEntities(reader *bitreader.ReaderType) SvcTempEntities {
         numentries := reader.TryReadInt8()
         length := reader.TryReadBits(17)
-        reader.SkipBits(int(length)) // TODO: Read data properly
+        //reader.SkipBits(int(length)) // TODO: Read data properly
         return SvcTempEntities{
                 NumEntries: numentries,
-                //Data:       reader.TryReadBytesToSlice(int(length/8) + int(length%8)),
+                Data:       reader.TryReadBitsToSlice(int(length)),
         }
 }
diff --git a/packets/messages/types/SvcUpdateStringTable.go b/packets/messages/types/SvcUpdateStringTable.go
index d1ca9bb..9f178a5 100644
--- a/packets/messages/types/SvcUpdateStringTable.go
+++ b/packets/messages/types/SvcUpdateStringTable.go
@@ -16,7 +16,6 @@ func ParseSvcUpdateStringTable(reader *bitreader.ReaderType) SvcUpdateStringTabl
                 svcupdatestringtable.NumChangedEntries = int16(reader.TryReadInt16())
         }
         length := reader.TryReadBits(20)
-        reader.SkipBits(int(length)) // TODO: Read data properly
-        //svcupdatestringtable.Data = reader.TryReadBytesToSlice(int(length / 8))
+        svcupdatestringtable.Data = reader.TryReadBitsToSlice(int(length))
         return svcupdatestringtable
 }
diff --git a/packets/messages/types/SvcUserMessage.go b/packets/messages/types/SvcUserMessage.go
index 6d09fa1..c7b0566 100644
--- a/packets/messages/types/SvcUserMessage.go
+++ b/packets/messages/types/SvcUserMessage.go
@@ -12,9 +12,8 @@ type SvcUserMessage struct {
 func ParseSvcUserMessage(reader *bitreader.ReaderType) SvcUserMessage {
         msgtype := reader.TryReadInt8()
         length := reader.TryReadBits(12)
-        reader.SkipBits(int(length)) // TODO: Read data properly
         return SvcUserMessage{
                 MsgType: msgtype,
-                //Data:    reader.TryReadBytesToSlice(int(length / 8)),
+                Data:    reader.TryReadBitsToSlice(int(length)),
         }
 }