Associate players with molotov detonation events (#135)

* Molotov have ThrownBy players

* Made FireWithOwnerStart a separate event

Author: econoraptor

DemoInfo/DP/Handler/GameEventHandler.cs

@@ -234,13 +234,21 @@ public static void Apply(GameEvent rawEvent, DemoParser parser)
 				parser.RaiseSmokeEnd(FillNadeEvent<SmokeEventArgs>(MapData(eventDescriptor, rawEvent), parser));
 				break;
 			case "inferno_startburn":
-				parser.RaiseFireStart(FillNadeEvent<FireEventArgs>(MapData(eventDescriptor, rawEvent), parser));
+				var fireData = MapData(eventDescriptor, rawEvent);
+				var fireArgs = FillNadeEvent<FireEventArgs>(fireData, parser);
+				var fireStarted = new Tuple<int, FireEventArgs>((int)fireData["entityid"], fireArgs);
+				parser.GEH_StartBurns.Enqueue(fireStarted);
+				parser.RaiseFireStart(fireArgs);
 				break;
 			case "inferno_expire":
-				parser.RaiseFireEnd(FillNadeEvent<FireEventArgs>(MapData(eventDescriptor, rawEvent), parser));
+				var fireEndData = MapData(eventDescriptor, rawEvent);
+				var fireEndArgs = FillNadeEvent<FireEventArgs>(fireEndData, parser);
+				int entityID = (int)fireEndData["entityid"];
+				fireEndArgs.ThrownBy = parser.InfernoOwners[entityID];
+				parser.RaiseFireEnd(fireEndArgs);
 				break;
 				#endregion
-			
+
 			case "player_connect":
 				data = MapData (eventDescriptor, rawEvent);
 

DemoInfo/DemoParser.cs

@@ -142,6 +142,12 @@ public class DemoParser : IDisposable
 		/// </summary>
 		public event EventHandler<FireEventArgs> FireNadeStarted;
 
+		/// <summary>
+		/// FireNadeStarted, but with correct ThrownBy player.
+		/// Hint: Raised at the end of inferno_startburn tick instead of exactly when the event is parsed
+		/// </summary>
+		public EventHandler<FireEventArgs> FireNadeWithOwnerStarted;
+
 		/// <summary>
 		/// Occurs when fire nade ended.
 		/// Hint: When a round ends, this is *not* caĺled. 
@@ -415,6 +421,12 @@ public string TFlag
 		/// </summary>
 		internal List<Player> GEH_BlindPlayers = new List<Player>();
 
+		/// <summary>
+		/// Holds inferno_startburn event args so they can be matched with player
+		/// </summary>
+		internal Queue<Tuple<int, FireEventArgs>> GEH_StartBurns = new Queue<Tuple<int, FireEventArgs>>();
+
+
 		// These could be Dictionary<int, RecordedPropertyUpdate[]>, but I was too lazy to
 		// define that class. Also: It doesn't matter anyways, we always have to cast.
 
@@ -584,6 +596,12 @@ public bool ParseNextTick()
 				}
 			}
 
+			while (GEH_StartBurns.Count > 0) {
+				var fireTup = GEH_StartBurns.Dequeue();
+				fireTup.Item2.ThrownBy = InfernoOwners[fireTup.Item1];
+				RaiseFireWithOwnerStart(fireTup.Item2);
+			}
+
 			if (b) {
 				if (TickDone != null)
 					TickDone(this, new TickDoneEventArgs());
@@ -678,6 +696,8 @@ private void BindEntites()
 			HandlePlayers();
 
 			HandleWeapons ();
+
+			HandleInfernos();
 		}
 
 		private void HandleTeamScores()
@@ -1095,6 +1115,24 @@ private void HandleBombSites()
 			};
 
 		}
+
+		internal Dictionary<int, Player> InfernoOwners = new Dictionary<int, Player>();
+		private void HandleInfernos()
+		{
+			var inferno = SendTableParser.FindByName("CInferno");
+
+			inferno.OnNewEntity += (s, infEntity) => {
+				infEntity.Entity.FindProperty("m_hOwnerEntity").IntRecived += (s2, handleID) => {
+					int playerEntityID = handleID.Value & INDEX_MASK;
+					if (playerEntityID < PlayerInformations.Length && PlayerInformations[playerEntityID - 1] != null)
+						InfernoOwners[infEntity.Entity.ID] = PlayerInformations[playerEntityID - 1];
+				};
+			};
+
+			inferno.OnDestroyEntity += (s, infEntity) => {
+				InfernoOwners.Remove(infEntity.Entity.ID);
+			};
+		}
 		#if SAVE_PROP_VALUES
 		[Obsolete("This method is only for debugging-purposes and shuld never be used in production, so you need to live with this warning.")]
 		public string DumpAllEntities()
@@ -1290,6 +1328,15 @@ internal void RaiseFireStart(FireEventArgs args)
 				NadeReachedTarget(this, args);
 		}
 
+		internal void RaiseFireWithOwnerStart(FireEventArgs args)
+		{
+			if (FireNadeWithOwnerStarted != null)
+				FireNadeWithOwnerStarted(this, args);
+
+			if (NadeReachedTarget != null)
+				NadeReachedTarget(this, args);
+		}
+
 		internal void RaiseFireEnd(FireEventArgs args)
 		{
 			if (FireNadeEnded != null)
@@ -1412,6 +1459,7 @@ public void Dispose ()
 			this.ExplosiveNadeExploded = null;
 			this.FireNadeEnded = null;
 			this.FireNadeStarted = null;
+			this.FireNadeWithOwnerStarted = null;
 			this.FlashNadeExploded = null;
 			this.HeaderParsed = null;
 			this.MatchStarted = null;