From 305ef7832cdd7301e575c51aefdadb61d4914c64 Mon Sep 17 00:00:00 2001 From: Arda Serdar Pektezol <1669855+pektezol@users.noreply.github.com> Date: Thu, 10 Nov 2022 23:44:46 +0300 Subject: better debugging, still broken --- packets/messages/message.go | 71 +++++++++++++++-------------- packets/messages/types/SvcPacketEntities.go | 3 -- packets/messages/types/SvcSetPause.go | 4 +- packets/messages/types/SvcTempEntities.go | 4 +- packets/messages/types/SvcUserMessage.go | 4 +- 5 files changed, 46 insertions(+), 40 deletions(-) diff --git a/packets/messages/message.go b/packets/messages/message.go index 05690cc..f934419 100644 --- a/packets/messages/message.go +++ b/packets/messages/message.go @@ -2,6 +2,7 @@ package messages import ( "bytes" + "fmt" "github.com/pektezol/bitreader" "github.com/pektezol/demoparser/packets/messages/types" @@ -15,76 +16,78 @@ func ParseMessage(data []byte) []Message { if err != nil { break } + fmt.Printf("Reading message type: %d\n", messageType) switch messageType { - case 0x00: + case 0: messages = append(messages, Message{Data: types.NetNop{}}) - case 0x01: + case 1: messages = append(messages, Message{Data: types.ParseNetDisconnect(reader)}) - case 0x02: + case 2: messages = append(messages, Message{Data: types.ParseNetFile(reader)}) - case 0x03: + case 3: messages = append(messages, Message{Data: types.ParseNetSplitScreenUser(reader)}) - case 0x04: + case 4: messages = append(messages, Message{Data: types.ParseNetTick(reader)}) - case 0x05: + case 5: messages = append(messages, Message{Data: types.ParseNetStringCmd(reader)}) - case 0x06: + case 6: messages = append(messages, Message{Data: types.ParseNetSetConVar(reader)}) - case 0x07: + case 7: messages = append(messages, Message{Data: types.ParseNetSignOnState(reader)}) - case 0x08: + case 8: messages = append(messages, Message{Data: types.ParseSvcServerInfo(reader)}) - case 0x09: + case 9: messages = append(messages, Message{Data: types.ParseSvcSendTable(reader)}) - case 0x10: + case 10: messages = append(messages, Message{Data: types.ParseSvcClassInfo(reader)}) - case 0x11: + case 11: messages = append(messages, Message{Data: types.ParseSvcSetPause(reader)}) - case 0x12: + case 12: messages = append(messages, Message{Data: types.ParseSvcCreateStringTable(reader)}) - case 0x13: + case 13: messages = append(messages, Message{Data: types.ParseSvcUpdateStringTable(reader)}) - case 0x14: + case 14: messages = append(messages, Message{Data: types.ParseSvcVoiceInit(reader)}) - case 0x15: + case 15: messages = append(messages, Message{Data: types.ParseSvcVoiceData(reader)}) - case 0x16: + case 16: messages = append(messages, Message{Data: types.ParseSvcPrint(reader)}) - case 0x17: + case 17: messages = append(messages, Message{Data: types.ParseSvcSounds(reader)}) - case 0x18: + case 18: messages = append(messages, Message{Data: types.ParseSvcSetView(reader)}) - case 0x19: + case 19: messages = append(messages, Message{Data: types.ParseSvcFixAngle(reader)}) - case 0x20: + case 20: messages = append(messages, Message{Data: types.ParseSvcCrosshairAngle(reader)}) - case 0x21: + case 21: // TODO: SvcBspDecal - case 0x22: + case 22: messages = append(messages, Message{Data: types.ParseSvcSplitScreen(reader)}) - case 0x23: + case 23: messages = append(messages, Message{Data: types.ParseSvcUserMessage(reader)}) - case 0x24: + case 24: messages = append(messages, Message{Data: types.ParseSvcEntityMessage(reader)}) - case 0x25: + case 25: // TODO: SvcGameEvent - case 0x26: + case 26: messages = append(messages, Message{Data: types.ParseSvcPacketEntities(reader)}) - case 0x27: + case 27: messages = append(messages, Message{Data: types.ParseSvcTempEntities(reader)}) - case 0x28: + case 28: messages = append(messages, Message{Data: types.ParseSvcPrefetch(reader)}) - case 0x29: + case 29: messages = append(messages, Message{Data: types.ParseSvcMenu(reader)}) - case 0x30: + case 30: messages = append(messages, Message{Data: types.ParseSvcGameEventList(reader)}) - case 0x31: + case 31: messages = append(messages, Message{Data: types.ParseSvcGetCvarValue(reader)}) - case 0x32: + case 32: messages = append(messages, Message{Data: types.ParseSvcCmdKeyValues(reader)}) - case 0x33: + case 33: messages = append(messages, Message{Data: types.ParseSvcPaintmapData(reader)}) } + //fmt.Println(messages) } return messages } diff --git a/packets/messages/types/SvcPacketEntities.go b/packets/messages/types/SvcPacketEntities.go index bc4c41a..5fc27db 100644 --- a/packets/messages/types/SvcPacketEntities.go +++ b/packets/messages/types/SvcPacketEntities.go @@ -1,8 +1,6 @@ package types import ( - "fmt" - "github.com/pektezol/bitreader" ) @@ -26,7 +24,6 @@ func ParseSvcPacketEntities(reader *bitreader.ReaderType) SvcPacketEntities { baseline := reader.TryReadBool() updatedentries := reader.TryReadBits(11) length := reader.TryReadBits(20) - fmt.Println(length) return SvcPacketEntities{ MaxEntries: uint16(maxentries), IsDelta: isdelta, diff --git a/packets/messages/types/SvcSetPause.go b/packets/messages/types/SvcSetPause.go index 040fb6a..c71485c 100644 --- a/packets/messages/types/SvcSetPause.go +++ b/packets/messages/types/SvcSetPause.go @@ -1,6 +1,8 @@ package types -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" +) type SvcSetPause struct { Paused bool diff --git a/packets/messages/types/SvcTempEntities.go b/packets/messages/types/SvcTempEntities.go index cd021a8..ce89dca 100644 --- a/packets/messages/types/SvcTempEntities.go +++ b/packets/messages/types/SvcTempEntities.go @@ -1,6 +1,8 @@ package types -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" +) type SvcTempEntities struct { NumEntries uint8 diff --git a/packets/messages/types/SvcUserMessage.go b/packets/messages/types/SvcUserMessage.go index 2e6f74a..d816f22 100644 --- a/packets/messages/types/SvcUserMessage.go +++ b/packets/messages/types/SvcUserMessage.go @@ -1,6 +1,8 @@ package types -import "github.com/pektezol/bitreader" +import ( + "github.com/pektezol/bitreader" +) type SvcUserMessage struct { MsgType uint8 -- cgit v1.2.3