Skip to content

Commit 7caa555

Browse files
committed
core: fix events.BombPlantBegin.Site being off for new demos
old demos had the site attirbute as short, new demos seem to have it as a long
1 parent 041838a commit 7caa555

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

pkg/demoinfocs/game_events.go

+8-1
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,14 @@ func (geh gameEventHandler) bombExploded(data map[string]*msg.CSVCMsg_GameEventK
636636
func (geh gameEventHandler) bombEvent(data map[string]*msg.CSVCMsg_GameEventKeyT) (events.BombEvent, error) {
637637
bombEvent := events.BombEvent{Player: geh.playerByUserID32(data["userid"].GetValShort())}
638638

639-
site := int(data["site"].GetValShort())
639+
const gameEventKeyTypeLong = 3
640+
641+
var site int
642+
if data["site"].Type == gameEventKeyTypeLong {
643+
site = int(data["site"].ValLong)
644+
} else {
645+
site = int(data["site"].ValShort)
646+
}
640647

641648
switch site {
642649
case geh.parser.bombsiteA.index:

pkg/demoinfocs/parser.go

+2
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,8 @@ func NewParserWithConfig(demostream io.Reader, config ParserConfig) Parser {
336336
p.grenadeModelIndices = make(map[int]common.EquipmentType)
337337
p.gameEventHandler = newGameEventHandler(&p)
338338
p.userMessageHandler = newUserMessageHandler(&p)
339+
p.bombsiteA.index = -1
340+
p.bombsiteB.index = -1
339341

340342
dispatcherCfg := dp.Config{
341343
PanicHandler: func(v interface{}) {

0 commit comments

Comments
 (0)