@@ -81,22 +81,22 @@ func newGameEventHandler(parser *Parser) gameEventHandler {
8181 "player_death" : geh .playerDeath , // Player died
8282 "player_hurt" : geh .playerHurt , // Player got hurt
8383 "player_blind" : geh .playerBlind , // Player got blinded by a flash
84- "flashbang_detonate" : geh .flashbangDetonate , // Flash exploded
85- "hegrenade_detonate" : geh .hegranadeDetonate , // HE exploded
84+ "flashbang_detonate" : geh .flashBangDetonate , // Flash exploded
85+ "hegrenade_detonate" : geh .heGrenadeDetonate , // HE exploded
8686 "decoy_started" : geh .decoyStarted , // Decoy started
8787 "decoy_detonate" : geh .decoyDetonate , // Decoy exploded/expired
88- "smokegrenade_detonate" : geh .smokegrenadeDetonate , // Smoke popped
89- "smokegrenade_expired" : geh .smokegrenadeExpired , // Smoke expired
90- "inferno_startburn" : geh .infernoStartburn , // Incendiary exploded/started
88+ "smokegrenade_detonate" : geh .smokeGrenadeDetonate , // Smoke popped
89+ "smokegrenade_expired" : geh .smokeGrenadeExpired , // Smoke expired
90+ "inferno_startburn" : geh .infernoStartBurn , // Incendiary exploded/started
9191 "inferno_expire" : geh .infernoExpire , // Incendiary expired
9292 "player_connect" : geh .playerConnect , // Bot connected or player reconnected, players normally come in via string tables & data tables
9393 "player_disconnect" : geh .playerDisconnect , // Player disconnected (kicked, quit, timed out etc.)
9494 "player_team" : geh .playerTeam , // Player changed team
95- "bomb_beginplant" : geh .bombBeginplant , // Plant started
95+ "bomb_beginplant" : geh .bombBeginPlant , // Plant started
9696 "bomb_planted" : geh .bombPlanted , // Plant finished
9797 "bomb_defused" : geh .bombDefused , // Defuse finished
9898 "bomb_exploded" : geh .bombExploded , // Bomb exploded
99- "bomb_begindefuse" : geh .bombBegindefuse , // Defuse started
99+ "bomb_begindefuse" : geh .bombBeginDefuse , // Defuse started
100100 "item_equip" : geh .itemEquip , // Equipped, I think
101101 "item_pickup" : geh .itemPickup , // Picked up or bought?
102102 "item_remove" : geh .itemRemove , // Dropped?
@@ -292,7 +292,7 @@ func (geh gameEventHandler) playerBlind(desc *msg.CSVCMsg_GameEventListDescripto
292292 })
293293}
294294
295- func (geh gameEventHandler ) flashbangDetonate (desc * msg.CSVCMsg_GameEventListDescriptorT , ge * msg.CSVCMsg_GameEvent ) {
295+ func (geh gameEventHandler ) flashBangDetonate (desc * msg.CSVCMsg_GameEventListDescriptorT , ge * msg.CSVCMsg_GameEvent ) {
296296 nadeEvent := geh .nadeEvent (desc , ge , common .EqFlash )
297297
298298 geh .gameState ().lastFlasher = nadeEvent .Thrower
@@ -301,7 +301,7 @@ func (geh gameEventHandler) flashbangDetonate(desc *msg.CSVCMsg_GameEventListDes
301301 })
302302}
303303
304- func (geh gameEventHandler ) hegranadeDetonate (desc * msg.CSVCMsg_GameEventListDescriptorT , ge * msg.CSVCMsg_GameEvent ) {
304+ func (geh gameEventHandler ) heGrenadeDetonate (desc * msg.CSVCMsg_GameEventListDescriptorT , ge * msg.CSVCMsg_GameEvent ) {
305305 geh .dispatch (events.HeExplode {
306306 GrenadeEvent : geh .nadeEvent (desc , ge , common .EqHE ),
307307 })
@@ -319,20 +319,20 @@ func (geh gameEventHandler) decoyDetonate(desc *msg.CSVCMsg_GameEventListDescrip
319319 })
320320}
321321
322- func (geh gameEventHandler ) smokegrenadeDetonate (desc * msg.CSVCMsg_GameEventListDescriptorT , ge * msg.CSVCMsg_GameEvent ) {
322+ func (geh gameEventHandler ) smokeGrenadeDetonate (desc * msg.CSVCMsg_GameEventListDescriptorT , ge * msg.CSVCMsg_GameEvent ) {
323323 geh .dispatch (events.SmokeStart {
324324 GrenadeEvent : geh .nadeEvent (desc , ge , common .EqSmoke ),
325325 })
326326}
327327
328- func (geh gameEventHandler ) smokegrenadeExpired (desc * msg.CSVCMsg_GameEventListDescriptorT , ge * msg.CSVCMsg_GameEvent ) {
328+ func (geh gameEventHandler ) smokeGrenadeExpired (desc * msg.CSVCMsg_GameEventListDescriptorT , ge * msg.CSVCMsg_GameEvent ) {
329329 geh .dispatch (events.SmokeExpired {
330330 GrenadeEvent : geh .nadeEvent (desc , ge , common .EqSmoke ),
331331 })
332332}
333333
334- func (geh gameEventHandler ) infernoStartburn (desc * msg.CSVCMsg_GameEventListDescriptorT , ge * msg.CSVCMsg_GameEvent ) {
335- geh .dispatch (events.FireGrenadeStart {
334+ func (geh gameEventHandler ) infernoStartBurn (desc * msg.CSVCMsg_GameEventListDescriptorT , ge * msg.CSVCMsg_GameEvent ) {
335+ geh .delay (events.FireGrenadeStart {
336336 GrenadeEvent : geh .nadeEvent (desc , ge , common .EqIncendiary ),
337337 })
338338}
@@ -414,7 +414,7 @@ func (geh gameEventHandler) playerTeam(desc *msg.CSVCMsg_GameEventListDescriptor
414414 }
415415}
416416
417- func (geh gameEventHandler ) bombBeginplant (desc * msg.CSVCMsg_GameEventListDescriptorT , ge * msg.CSVCMsg_GameEvent ) {
417+ func (geh gameEventHandler ) bombBeginPlant (desc * msg.CSVCMsg_GameEventListDescriptorT , ge * msg.CSVCMsg_GameEvent ) {
418418 geh .dispatch (events.BombPlantBegin {BombEvent : geh .bombEvent (desc , ge )})
419419}
420420
@@ -467,7 +467,7 @@ func (geh gameEventHandler) bombEvent(desc *msg.CSVCMsg_GameEventListDescriptorT
467467 return bombEvent
468468}
469469
470- func (geh gameEventHandler ) bombBegindefuse (desc * msg.CSVCMsg_GameEventListDescriptorT , ge * msg.CSVCMsg_GameEvent ) {
470+ func (geh gameEventHandler ) bombBeginDefuse (desc * msg.CSVCMsg_GameEventListDescriptorT , ge * msg.CSVCMsg_GameEvent ) {
471471 data := mapGameEventData (desc , ge )
472472
473473 geh .gameState ().currentDefuser = geh .playerByUserID32 (data ["userid" ].GetValShort ())
0 commit comments