Implemented Instance-Baseline Parsing.

#fancy.
StatsHelix · Nov 23, 2014 · 9672e10 · 0BuRner · Dec 5, 2014 · moritzuehling
1 parent e61fc17
commit 9672e10
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 22 deletions.
diff --git a/DemoInfo/DP/Handler/CreateStringTableUserInfoHandler.cs b/DemoInfo/DP/Handler/CreateStringTableUserInfoHandler.cs
@@ -14,7 +14,7 @@ class CreateStringTableUserInfoHandler : IMessageParser
         public bool TryApplyMessage(IExtensible message, DemoParser parser)
         {
 			var create = message as CSVCMsg_CreateStringTable;
-			if ((create == null) || (create.name != "userinfo"))
+			if ((create == null))
 				return false;
 
             ParseStringTableUpdate(create, parser);
@@ -32,7 +32,6 @@ public void ParseStringTableUpdate(CSVCMsg_CreateStringTable table, DemoParser p
 				while ((nTemp >>= 1) != 0)
 					++nEntryBits;
 
-
 				List<string> history = new List<string>();
 
 				int lastEntry = -1;
@@ -70,6 +69,8 @@ public void ParseStringTableUpdate(CSVCMsg_CreateStringTable table, DemoParser p
 					if (entry == null)
 						entry = "";
 
+					history.Add(entry);
+
 					// Read in the user data.
 					byte[] userdata = new byte[0];
 					if (reader.ReadBit()) {
@@ -85,14 +86,22 @@ public void ParseStringTableUpdate(CSVCMsg_CreateStringTable table, DemoParser p
 					if (userdata.Length == 0)
 						break;
 
-					// Now we'll parse the players out of it.
-					BinaryReader playerReader = new BinaryReader(new MemoryStream(userdata));
-					PlayerInfo info = PlayerInfo.ParseFrom(playerReader);
+					if (table.name == "userinfo") {
+
+						// Now we'll parse the players out of it.
+						BinaryReader playerReader = new BinaryReader(new MemoryStream(userdata));
+						PlayerInfo info = PlayerInfo.ParseFrom(playerReader);
 
-					if (entryIndex < parser.RawPlayers.Count)
-						parser.RawPlayers[entryIndex] = info;
-					else
-						parser.RawPlayers.Add(info);
+						if (entryIndex < parser.RawPlayers.Count)
+							parser.RawPlayers[entryIndex] = info;
+						else
+							parser.RawPlayers.Add(info);
+
+					} else if (table.name == "instancebaseline") {
+						int classid = int.Parse(entry); //wtf volvo?
+
+						parser.instanceBaseline[classid] = userdata; 
+					}
 				}
 			}
         }

diff --git a/DemoInfo/DP/Handler/PacketEntitesHandler.cs b/DemoInfo/DP/Handler/PacketEntitesHandler.cs
@@ -6,6 +6,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.IO;
 
 namespace DemoInfo.DP.Handler
 {
@@ -27,13 +28,11 @@ public bool TryApplyMessage(ProtoBuf.IExtensible message, DemoParser parser)
 						// enter flag
 						if (reader.ReadBit()) {
 							var e = ReadEnterPVS(reader, currentEntity, parser);
+
 							e.ApplyUpdate(reader);
 						} else {
 							// preserve
 							Entity e = parser.entites[currentEntity];
-							//Console.ForegroundColor = ConsoleColor.Green;
-							//Console.WriteLine("Entity #" + e.ID + ": " + e.ServerClass.Name);
-							//Console.ResetColor();
 							e.ApplyUpdate(reader);
 						}
 					} else {
@@ -65,6 +64,13 @@ public Entity ReadEnterPVS(IBitStream reader, int id, DemoParser parser)
 
             parser.entites[newEntity.ID] = newEntity;
 
+
+
+			MemoryStream ms = new MemoryStream(parser.instanceBaseline[serverClassID]);
+			ms.Seek(0, SeekOrigin.Begin);
+			newEntity.ApplyUpdate(BitStreamUtil.Create(ms));
+			ms.Close();
+
             return newEntity;
         }
 

diff --git a/DemoInfo/DemoParser.cs b/DemoInfo/DemoParser.cs
@@ -70,6 +70,8 @@ public string Map
 		internal List<Player> GEH_BlindPlayers = new List<Player>();
 		#endregion
 
+		internal Dictionary<int, byte[]> instanceBaseline = new Dictionary<int, byte[]>();
+
 		public float TickRate
 		{
 			get { return this.Header.PlaybackFrames / this.Header.PlaybackTime; }

diff --git a/DemoInfo/ST/StringTableParser.cs b/DemoInfo/ST/StringTableParser.cs
@@ -17,15 +17,15 @@ public void ParsePacket(Stream stream, DemoParser parser)
 				for (int i = 0; i < numTables; i++) {
 					string tableName = reader.ReadString();
 
-					ParseStringTable(reader, tableName == "userinfo", parser);
+					ParseStringTable(reader, tableName, parser);
 				}
 			}
         }
 
-		public void ParseStringTable(IBitStream reader, bool isUserInfo, DemoParser parser)
-        {
-			if (isUserInfo)
-				parser.RawPlayers.Clear();
+		public void ParseStringTable(IBitStream reader, string tableName, DemoParser parser)
+		{
+			if (tableName == "userinfo")
+				parser.RawPlayers.Clear(); 
 
             int numStrings = (int)reader.ReadInt(16);
 
@@ -43,12 +43,15 @@ public void ParseStringTable(IBitStream reader, bool isUserInfo, DemoParser pars
 
                     byte[] data = reader.ReadBytes(userDataSize);
 
-                    if (isUserInfo && data.Length >= 340)
-                    {
-                        PlayerInfo info = PlayerInfo.ParseFrom(new BinaryReader(new MemoryStream(data)));
+					if (tableName == "userinfo") {
+						PlayerInfo info = PlayerInfo.ParseFrom(new BinaryReader(new MemoryStream(data)));
+
+						parser.RawPlayers.Add(info);
+					} else if (tableName == "instancebaseline") {
+						int classid = int.Parse(stringName); //wtf volvo?
 
-                        parser.RawPlayers.Add(info);
-                    }
+						parser.instanceBaseline[classid] = data; 
+					}
                 }
             }