Clean up around bomb-events

Author: markus-wa

datatables.go

@@ -137,9 +137,8 @@ func (p *Parser) bindBombSites() {
 	})
 
 	p.stParser.FindServerClassByName("CBaseTrigger").RegisterEntityCreatedHandler(func(baseTrigger st.EntityCreatedEvent) {
-		// TODO: Switch triggers to map[int]boundingBoxInformation?
-		t := &boundingBoxInformation{index: baseTrigger.Entity.ID}
-		p.triggers = append(p.triggers, t)
+		t := new(boundingBoxInformation)
+		p.triggers[baseTrigger.Entity.ID] = t
 
 		baseTrigger.Entity.FindProperty("m_Collision.m_vecMins").RegisterPropertyUpdateHandler(func(vec st.PropValue) {
 			t.min = vec.VectorVal

events/events.go

@@ -103,7 +103,7 @@ type WeaponFiredEvent struct {
 // NadeEventIf is the interface for all NadeEvents. Used to catch
 // the different events with the same handler.
 type NadeEventIf interface {
-	dummyNade()
+	implementsNadeEventIf()
 }
 
 // NadeEvent contains the common attributes of nade events. Dont register
@@ -115,7 +115,7 @@ type NadeEvent struct {
 }
 
 // Make NadeEvents implement NadeEventIf
-func (NadeEvent) dummyNade() {}
+func (NadeEvent) implementsNadeEventIf() {}
 
 // HeExplodedEvent signals the explosion of a HE.
 type HeExplodedEvent struct {
@@ -163,31 +163,34 @@ type PlayerFlashedEvent struct {
 	Player *common.Player
 }
 
-// BombEventIf is the interface for alll the bomb events. Like NadeEventIf for NadeEvents.
+// BombEventIf is the interface for all the bomb events. Like NadeEventIf for NadeEvents.
 type BombEventIf interface {
-	dummyBomb()
+	implementsBombEventIf()
 }
 
+type bombsite rune
+
+// Bombsite identifiers
+const (
+	BombsiteA bombsite = 'A'
+	BombsiteB bombsite = 'B'
+)
+
 // BombEvent contains the common attributes of bomb events. Dont register
 // handlers on this tho, you want BombEventIf for that.
 type BombEvent struct {
 	Player *common.Player
-	Site   rune
+	Site   bombsite
 }
 
 // Make BombEvent implement BombEventIf
-func (BombEvent) dummyBomb() {}
+func (BombEvent) implementsBombEventIf() {}
 
 // BombBeginPlant signals the start of a plant.
 type BombBeginPlant struct {
 	BombEvent
 }
 
-// BombAbortPlant signals the abortion of a plant.
-type BombAbortPlant struct {
-	BombEvent
-}
-
 // BombPlantedEvent signals that the bomb has been planted.
 type BombPlantedEvent struct {
 	BombEvent
@@ -205,15 +208,11 @@ type BombExplodedEvent struct {
 
 // BombBeginDefuseEvent signals the start of defusing.
 type BombBeginDefuseEvent struct {
-	Defuser *common.Player
-	HasKit  bool
+	Player *common.Player
+	HasKit bool
 }
 
-// BombAbortDefuseEvent signals that defusing was aborted.
-type BombAbortDefuseEvent struct {
-	Defuser *common.Player
-	HasKit  bool
-}
+func (BombBeginDefuseEvent) implementsBombEventIf() {}
 
 // PlayerHurtEvent signals that a player has been damaged.
 type PlayerHurtEvent struct {

packet_handlers.go

@@ -357,8 +357,6 @@ func (p *Parser) handleGameEvent(ge *msg.CSVCMsg_GameEvent) {
 
 	case "bomb_beginplant": // Plant started
 		fallthrough
-	case "bomb_abortplant": // Plant stopped
-		fallthrough
 	case "bomb_planted": // Plant finished
 		fallthrough
 	case "bomb_defused": // Defuse finished
@@ -372,22 +370,21 @@ func (p *Parser) handleGameEvent(ge *msg.CSVCMsg_GameEvent) {
 
 		switch site {
 		case p.bombsiteA.index:
-			e.Site = 'A'
+			e.Site = events.BombsiteA
 		case p.bombsiteB.index:
-			e.Site = 'B'
+			e.Site = events.BombsiteB
 		default:
-			var t *boundingBoxInformation
-			for _, tr := range p.triggers {
-				if tr.index == site {
-					t = tr
-				}
+			t := p.triggers[site]
+
+			if t == nil {
+				panic(fmt.Sprintf("Bombsite with index %d not found", site))
 			}
 
 			if t.contains(p.bombsiteA.center) {
-				e.Site = 'A'
+				e.Site = events.BombsiteA
 				p.bombsiteA.index = site
 			} else if t.contains(p.bombsiteB.center) {
-				e.Site = 'B'
+				e.Site = events.BombsiteB
 				p.bombsiteB.index = site
 			} else {
 				panic("Bomb not planted on bombsite A or B")
@@ -397,8 +394,6 @@ func (p *Parser) handleGameEvent(ge *msg.CSVCMsg_GameEvent) {
 		switch d.Name {
 		case "bomb_beginplant":
 			p.eventDispatcher.Dispatch(events.BombBeginPlant{BombEvent: e})
-		case "bomb_abortplant":
-			p.eventDispatcher.Dispatch(events.BombAbortPlant{BombEvent: e})
 		case "bomb_planted":
 			p.eventDispatcher.Dispatch(events.BombPlantedEvent{BombEvent: e})
 		case "bomb_defused":
@@ -411,18 +406,8 @@ func (p *Parser) handleGameEvent(ge *msg.CSVCMsg_GameEvent) {
 		data = mapGameEventData(d, ge)
 
 		p.eventDispatcher.Dispatch(events.BombBeginDefuseEvent{
-			Defuser: p.connectedPlayers[int(data["userid"].GetValShort())],
-			HasKit:  data["haskit"].GetValBool(),
-		})
-
-	case "bomb_abortdefuse": // Defuse aborted
-		data = mapGameEventData(d, ge)
-
-		pl := p.connectedPlayers[int(data["userid"].GetValShort())]
-
-		p.eventDispatcher.Dispatch(events.BombAbortDefuseEvent{
-			Defuser: pl,
-			HasKit:  pl.HasDefuseKit,
+			Player: p.connectedPlayers[int(data["userid"].GetValShort())],
+			HasKit: data["haskit"].GetValBool(),
 		})
 
 	case "item_equip": // Equipped, I think

parser.go

@@ -43,7 +43,7 @@ type Parser struct {
 	ctState               TeamState
 	bombsiteA             bombsiteInfo
 	bombsiteB             bombsiteInfo
-	triggers              []*boundingBoxInformation
+	triggers              map[int]*boundingBoxInformation
 	instanceBaselines     map[int][]byte
 	preprocessedBaselines map[int]map[int]st.PropValue
 	gehDescriptors        map[int32]*msg.CSVCMsg_GameEventListDescriptorT
@@ -240,6 +240,7 @@ func NewParserWithBufferSize(demostream io.Reader, msgQueueBufferSize int, warnH
 	p.players = make(map[int]*common.Player)
 	p.connectedPlayers = make(map[int]*common.Player)
 	p.entities = make(map[int]*st.Entity)
+	p.triggers = make(map[int]*boundingBoxInformation)
 	p.cancelChan = make(chan struct{}, 1)
 	p.warn = warnHandler