Merge pull request #313 from markus-wa/fix-bombevent-site-long-vs-short

core: fix events.BombPlantBegin.Site being off for new demos

Author: markus-wa

pkg/demoinfocs/game_events.go

@@ -636,7 +636,14 @@ func (geh gameEventHandler) bombExploded(data map[string]*msg.CSVCMsg_GameEventK
 func (geh gameEventHandler) bombEvent(data map[string]*msg.CSVCMsg_GameEventKeyT) (events.BombEvent, error) {
 	bombEvent := events.BombEvent{Player: geh.playerByUserID32(data["userid"].GetValShort())}
 
-	site := int(data["site"].GetValShort())
+	const gameEventKeyTypeLong = 3
+
+	var site int
+	if data["site"].Type == gameEventKeyTypeLong {
+		site = int(data["site"].ValLong)
+	} else {
+		site = int(data["site"].ValShort)
+	}
 
 	switch site {
 	case geh.parser.bombsiteA.index:

pkg/demoinfocs/parser.go

@@ -336,6 +336,8 @@ func NewParserWithConfig(demostream io.Reader, config ParserConfig) Parser {
 	p.grenadeModelIndices = make(map[int]common.EquipmentType)
 	p.gameEventHandler = newGameEventHandler(&p)
 	p.userMessageHandler = newUserMessageHandler(&p)
+	p.bombsiteA.index = -1
+	p.bombsiteB.index = -1
 
 	dispatcherCfg := dp.Config{
 		PanicHandler: func(v interface{}) {