fix & simplify a bunch of s2 code

Author: markus-wa

pkg/demoinfocs/game_events.go

@@ -578,12 +578,14 @@ func (geh gameEventHandler) HostageRescuedAll(map[string]*msg.CSVCMsg_GameEventK
 
 func (geh gameEventHandler) playerConnect(data map[string]*msg.CSVCMsg_GameEventKeyT) {
 	pl := common.PlayerInfo{
-		UserID: int(data["userid"].GetValShort()),
-		Name:   data["name"].GetValString(),
-		GUID:   data["networkid"].GetValString(),
+		UserID:       int(data["userid"].GetValShort()),
+		Name:         data["name"].GetValString(),
+		GUID:         data["networkid"].GetValString(),
+		XUID:         data["xuid"].GetValUint64(),
+		IsFakePlayer: data["bot"].GetValBool(),
 	}
 
-	if pl.GUID != "" {
+	if pl.GUID != "" && pl.XUID == 0 {
 		var err error
 		pl.XUID, err = guidToSteamID64(pl.GUID)
 

pkg/demoinfocs/parsing.go

@@ -370,11 +370,7 @@ func (p *parser) parseFrameS2() bool {
 
 	p.msgQueue <- ingameTickNumber(int32(tick))
 
-	if msgType == msgs2.EDemoCommands_DEM_Stop {
-		return false
-	}
-
-	return true
+	return msgType != msgs2.EDemoCommands_DEM_Stop
 }
 
 // FIXME: refactor to interface instead of switch

pkg/demoinfocs/s2_commands.go

@@ -279,7 +279,6 @@ func (m *pendingMessage) priority() int {
 		// provide context in terms of delta updates.
 		int32(msgs2.SVC_Messages_svc_PacketEntities):
 		return 5
-
 	}
 
 	return 0

pkg/demoinfocs/sendtables/st_parser.go

@@ -26,19 +26,18 @@ type SendTableParser struct {
 	instanceBaselines map[int][]byte // Maps server-class IDs to raw instance baselines, needed for when we don't have the server-class when setting the baseline
 }
 
-func (p *SendTableParser) OnDemoClassInfo(m *msgs2.CDemoClassInfo) error {
-	//TODO implement me
-	panic("implement me")
+// the following funcs are S2 only
+
+func (p *SendTableParser) OnDemoClassInfo(*msgs2.CDemoClassInfo) error {
+	panic("not implemented")
 }
 
-func (p *SendTableParser) OnServerInfo(m *msgs2.CSVCMsg_ServerInfo) error {
-	//TODO implement me
-	panic("implement me")
+func (p *SendTableParser) OnServerInfo(*msgs2.CSVCMsg_ServerInfo) error {
+	panic("not implemented")
 }
 
-func (p *SendTableParser) OnPacketEntities(m *msgs2.CSVCMsg_PacketEntities) error {
-	//TODO implement me
-	panic("implement me")
+func (p *SendTableParser) OnPacketEntities(*msgs2.CSVCMsg_PacketEntities) error {
+	panic("not implemented")
 }
 
 // ServerClasses is a searchable list of ServerClasses.
@@ -132,10 +131,11 @@ func (p *SendTableParser) ParsePacket(b []byte) error {
 }
 
 func parseSendTable(r *bit.BitReader) sendTable {
+	var st msg.CSVCMsg_SendTable
+
 	size := int(r.ReadVarInt32())
 
-	st := new(msg.CSVCMsg_SendTable)
-	err := proto.Unmarshal(r.ReadBytes(size), st)
+	err := proto.Unmarshal(r.ReadBytes(size), &st)
 	if err != nil {
 		panic(fmt.Sprintf("Failed to unmarshal SendTable: %s", err.Error()))
 	}

pkg/demoinfocs/sendtables2/class.go

@@ -1,12 +1,9 @@
 package sendtables2
 
 import (
-	"regexp"
 	"strings"
 )
 
-var gameBuildRegexp = regexp.MustCompile(`/dota_v(\d+)/`)
-
 type class struct {
 	classId    int32
 	name       string

pkg/demoinfocs/sendtables2/entity.go

@@ -217,13 +217,14 @@ func (p *Parser) FilterEntity(fb func(*Entity) bool) []*Entity {
 func (p *Parser) OnPacketEntities(m *msgs2.CSVCMsg_PacketEntities) error {
 	r := newReader(m.GetEntityData())
 
-	var index = int32(-1)
-	var updates = int(m.GetUpdatedEntries())
-	var cmd uint32
-	var classId int32
-	var serial int32
-	var e *Entity
-	var op EntityOp
+	var (
+		index   = int32(-1)
+		updates = int(m.GetUpdatedEntries())
+		cmd     uint32
+		classId int32
+		serial  int32
+		e       *Entity
+	)
 
 	if !m.GetIsDelta() {
 		if p.entityFullPackets > 0 {
@@ -240,9 +241,10 @@ func (p *Parser) OnPacketEntities(m *msgs2.CSVCMsg_PacketEntities) error {
 
 	for ; updates > 0; updates-- {
 		next := index + int32(r.readUBitVar()) + 1
-		op = EntityOpNone
 		index = next
 
+		var op EntityOp
+
 		cmd = r.readBits(2)
 		if cmd&0x01 == 0 {
 			if cmd&0x02 != 0 {

pkg/demoinfocs/sendtables2/field_decoder.go

@@ -44,7 +44,7 @@ var fieldTypeDecoders = map[string]fieldDecoder{
 				DemoSimpleEncoders_t { m_Name = "float32"								m_VarType = "NET_DATA_TYPE_FLOAT32" },
 				DemoSimpleEncoders_t { m_Name = "float64"								m_VarType = "NET_DATA_TYPE_FLOAT64" },
 	*/
-	//"float32": noscaleDecoder,
+	// "float32": noscaleDecoder,
 
 	/*
 		DemoSimpleEncoders_t { m_Name = "bool"									m_VarType = "NET_DATA_TYPE_BOOL" },
@@ -227,10 +227,6 @@ var fieldTypeDecoders = map[string]fieldDecoder{
 	"CRenderComponent":  componentDecoder,
 }
 
-func unsignedFactory(f *field) fieldDecoder {
-	return unsignedDecoder
-}
-
 func unsigned64Factory(f *field) fieldDecoder {
 	switch f.encoder {
 	case "fixed64":
@@ -365,10 +361,6 @@ func qangleFactory(f *field) fieldDecoder {
 	}
 }
 
-func vector2Decoder(r *reader) interface{} {
-	return []float32{r.readFloat(), r.readFloat()}
-}
-
 func unsignedDecoder(r *reader) interface{} {
 	return uint64(r.readVarUint32())
 }

pkg/demoinfocs/sendtables2/field_patch.go

@@ -14,7 +14,7 @@ var fieldPatches = []fieldPatch{
 			DemoSimpleEncoders_t { m_Name =  "m_flAnimTime"							m_VarType = "NET_DATA_TYPE_UINT64" },
 		]
 	*/
-	fieldPatch{0, 0, func(f *field) {
+	{0, 0, func(f *field) {
 		switch f.varName {
 		case "m_flSimulationTime", "m_flAnimTime":
 			f.encoder = "simtime"