From b8c9cdc9996706047b605fcb179161a678fcb8db Mon Sep 17 00:00:00 2001
From: Arda Serdar Pektezol <1669855+pektezol@users.noreply.github.com>
Date: Sun, 6 Nov 2022 17:27:56 +0300
Subject: changed github username + other stuff that i don't remember

---
 messages/header.go   |  7 +++++--
 messages/messages.go | 18 +++++++++++-------
 messages/types.go    |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

(limited to 'messages')

diff --git a/messages/header.go b/messages/header.go
index 6320c71..34b36d3 100644
--- a/messages/header.go
+++ b/messages/header.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/bisaxa/bitreader"
-	"github.com/bisaxa/demoparser/utils"
+	"github.com/pektezol/bitreader"
+	"github.com/pektezol/demoparser/utils"
 )
 
 func ParseHeader(file *os.File) {
@@ -22,5 +22,8 @@ func ParseHeader(file *os.File) {
 	header.PlaybackTicks = int32(reader.TryReadInt32())
 	header.PlaybackFrames = int32(reader.TryReadInt32())
 	header.SignOnLength = int32(reader.TryReadInt32())
+	if header.DemoProtocol != 4 { // Old Engine == 2, 3 / New Engine == 4
+		panic("Only New Engine is supported.")
+	}
 	fmt.Printf("%+v", header)
 }
diff --git a/messages/messages.go b/messages/messages.go
index 478b7c7..b40684b 100644
--- a/messages/messages.go
+++ b/messages/messages.go
@@ -4,9 +4,10 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/bisaxa/bitreader"
-	"github.com/bisaxa/demoparser/classes"
-	"github.com/bisaxa/demoparser/utils"
+	"github.com/pektezol/bitreader"
+	"github.com/pektezol/demoparser/classes"
+	"github.com/pektezol/demoparser/classes/netsvc"
+	"github.com/pektezol/demoparser/utils"
 )
 
 func ParseMessage(file *os.File) (statusCode int) {
@@ -22,7 +23,10 @@ func ParseMessage(file *os.File) (statusCode int) {
 		packet.InSequence = int32(reader.TryReadInt32())
 		packet.OutSequence = int32(reader.TryReadInt32())
 		packet.Size = int32(reader.TryReadInt32())
-		reader.SkipBytes(int(packet.Size)) // TODO: NET/SVC Message Parsing
+		data := utils.ReadByteFromFile(file, packet.Size)
+		//fmt.Println(data)
+		netsvc.ParseNetSvcMessage(data)
+		//reader.SkipBytes(int(packet.Size)) // TODO: NET/SVC Message Parsing
 		fmt.Printf("[%d] (%d) SignOn: %v\n", messageTick, messageSlot, packet)
 		return 1
 	case 0x02: // Packet
@@ -32,7 +36,7 @@ func ParseMessage(file *os.File) (statusCode int) {
 		packet.OutSequence = int32(reader.TryReadInt32())
 		packet.Size = int32(reader.TryReadInt32())
 		reader.SkipBytes(int(packet.Size)) // TODO: NET/SVC Message Parsing
-		fmt.Printf("[%d] Packet: %v\n", messageTick, packet)
+		//fmt.Printf("[%d] Packet: %v\n", messageTick, packet)
 		return 2
 	case 0x03: // SyncTick
 		return 3
@@ -40,14 +44,14 @@ func ParseMessage(file *os.File) (statusCode int) {
 		var consolecmd ConsoleCmd
 		consolecmd.Size = int32(reader.TryReadInt32())
 		consolecmd.Data = string(utils.ReadByteFromFile(file, consolecmd.Size))
-		fmt.Printf("[%d] ConsoleCmd: %s\n", messageTick, consolecmd.Data)
+		//fmt.Printf("[%d] ConsoleCmd: %s\n", messageTick, consolecmd.Data)
 		return 4
 	case 0x05: // UserCmd
 		var usercmd UserCmd
 		usercmd.Cmd = int32(reader.TryReadInt32())
 		usercmd.Size = int32(reader.TryReadInt32())
 		usercmd.Data = classes.ParseUserCmdInfo(file, int(usercmd.Size))
-		fmt.Printf("[%d] UserCmd: %v\n", messageTick, usercmd.Data)
+		//fmt.Printf("[%d] UserCmd: %v\n", messageTick, usercmd.Data)
 		return 5
 	case 0x06: // DataTables
 		var datatables DataTables
diff --git a/messages/types.go b/messages/types.go
index a8dd19a..9c92c54 100644
--- a/messages/types.go
+++ b/messages/types.go
@@ -1,6 +1,6 @@
 package messages
 
-import "github.com/bisaxa/demoparser/classes"
+import "github.com/pektezol/demoparser/classes"
 
 type Header struct {
 	DemoFileStamp   string
-- 
cgit v1.2.3