Demo: Fixed time & archived time

src/API/DemoReader.cpp

@@ -68,13 +68,23 @@ namespace Iswenzz::CoD4::DM1
 	}
 
 	float DemoReader::GetTime()
+	{
+		return (DemoFile->CurrentSnapshotTime - DemoFile->StartSnapshotTime) / 50.0f / 20.0f;
+	}
+
+	float DemoReader::GetArchiveTime()
 	{
 		return (DemoFile->CurrentFrameTime - DemoFile->StartFrameTime) / 50.0f / 20.0f;
 	}
 
-	float DemoReader::GetTimeMilliseconds()
+	int DemoReader::GetTimeMilliseconds()
+	{
+		return GetTime() * 1000;
+	}
+
+	int DemoReader::GetArchiveTimeMilliseconds()
 	{
-		return GetTime() * 1000.0f;
+		return GetArchiveTime() * 1000;
 	}
 
 	int DemoReader::GetServerTime()

src/API/DemoReader.hpp

@@ -74,16 +74,28 @@ namespace Iswenzz::CoD4::DM1
 		void Close();
 
 		/// <summary>
-		/// Get the demo time.
+		/// Get the snapshot time.
 		/// </summary>
 		/// <returns></returns>
 		float GetTime();
 
 		/// <summary>
-		/// Get the demo time in milliseconds.
+		/// Get the archive time.
 		/// </summary>
 		/// <returns></returns>
-		float GetTimeMilliseconds();
+		float GetArchiveTime();
+
+		/// <summary>
+		/// Get the snapshot time in milliseconds.
+		/// </summary>
+		/// <returns></returns>
+		int GetTimeMilliseconds();
+
+		/// <summary>
+		/// Get the archive time in milliseconds.
+		/// </summary>
+		/// <returns></returns>
+		int GetArchiveTimeMilliseconds();
 
 		/// <summary>
 		/// Get the server time.

src/API/__test__/DemoReader.test.cpp

@@ -8,14 +8,10 @@ TEST_F(DemoFixture, DemoReader)
         auto snapshot = Reader->GetCurrentSnapshot();
         auto entities = Reader->GetLastUpdatedEntities();
 
-        if (!Reader->GetCurrentSnapshot().valid)
+        if (!snapshot.valid)
             continue;
 
-        float x = snapshot.ps.velocity[0];
-        float y = snapshot.ps.velocity[1];
-
-        //std::cout << snapshot.serverTime << " " << std::sqrt((x * x) + (y * y)) << std::endl;
-        //std::cout << Reader->GetFPS() << std::endl;
+        std::cout << Reader->GetTime() << " " << Reader->GetTimeMilliseconds() << std::endl;
     }
     EXPECT_TRUE(Reader->GetCurrentFrame().commandTime);
 }

src/Demo/Demo.cpp

@@ -225,6 +225,8 @@ namespace Iswenzz::CoD4::DM1
 		DemoFile.read(reinterpret_cast<char*>(&frame.angles[1]), sizeof(float));
 		DemoFile.read(reinterpret_cast<char*>(&frame.angles[2]), sizeof(float));
 
+		if (!StartFrameTime)
+			StartFrameTime = frame.commandTime;
 		if (frame.commandTime > CurrentFrameTime)
 		{
 			PreviousFrameTime = CurrentFrameTime;
@@ -467,13 +469,18 @@ namespace Iswenzz::CoD4::DM1
 		CurrentSnapshot.serverTime = msg.ReadInt();
 		CurrentSnapshot.messageNum = msg.SrvMsgSeq;
 
-		if (!StartFrameTime)
-			StartFrameTime = CurrentSnapshot.serverTime;
-
 		uint8_t deltaNum = msg.ReadByte();
 		CurrentSnapshot.deltaNum = !deltaNum ? -1 : CurrentSnapshot.messageNum - deltaNum;
 		CurrentSnapshot.snapFlags = msg.ReadByte();
 
+		if (!StartSnapshotTime)
+			StartSnapshotTime = CurrentSnapshot.serverTime;
+		if (CurrentSnapshot.serverTime > CurrentSnapshotTime)
+		{
+			PreviousSnapshotTime = CurrentSnapshotTime;
+			CurrentSnapshotTime = CurrentSnapshot.serverTime;
+		}
+
 		// Integrity checks
 		if (CurrentSnapshot.deltaNum > 0)
 		{

src/Demo/Demo.hpp

@@ -23,14 +23,17 @@ namespace Iswenzz::CoD4::DM1
 		bool IsOpen = false;
 		bool IsEOF = true;
 		bool IsWriting = false;
-		bool Verbose;
+		bool Verbose = false;
 
 		int Protocol = COD4_PROTOCOL;
 		MSGType CurrentMessageType = { };
 
 		int StartFrameTime = 0;
 		int PreviousFrameTime = 0;
 		int CurrentFrameTime = 0;
+		int StartSnapshotTime = 0;
+		int PreviousSnapshotTime = 0;
+		int CurrentSnapshotTime = 0;
 		int LastFrameSrvMsgSeq = 0;
 		int FirstFrameSrvMsgSeq = 0;