From 1a3bb727c5fad8d0bea2b6653e9cd01556a394fe Mon Sep 17 00:00:00 2001
From: ChillerDragon <ChillerDragon@gmail.com>
Date: Sun, 5 May 2024 16:01:55 +0800
Subject: [PATCH] Make demo snap variable names more obvious

Closed #8245
---
 src/engine/shared/demo.cpp | 18 +++++++++---------
 src/engine/shared/demo.h   |  9 +++++++--
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/engine/shared/demo.cpp b/src/engine/shared/demo.cpp
index 4a2b6e699..5e261fbce 100644
--- a/src/engine/shared/demo.cpp
+++ b/src/engine/shared/demo.cpp
@@ -665,7 +665,7 @@ void CDemoPlayer::DoTick()
 				break;
 			}
 
-			DataSize = CVariableInt::Decompress(m_aDecompressedSnapshotData, DataSize, m_aCurrentSnapshotData, sizeof(m_aCurrentSnapshotData));
+			DataSize = CVariableInt::Decompress(m_aDecompressedSnapshotData, DataSize, m_aChunkData, sizeof(m_aChunkData));
 			if(DataSize < 0)
 			{
 				Stop("Error during intpack decompression");
@@ -676,8 +676,8 @@ void CDemoPlayer::DoTick()
 		if(ChunkType == CHUNKTYPE_DELTA)
 		{
 			// process delta snapshot
-			CSnapshot *pNewsnap = (CSnapshot *)m_aDeltaSnapshotData;
-			DataSize = m_pSnapshotDelta->UnpackDelta((CSnapshot *)m_aLastSnapshotData, pNewsnap, m_aCurrentSnapshotData, DataSize);
+			CSnapshot *pNewsnap = (CSnapshot *)m_aSnapshot;
+			DataSize = m_pSnapshotDelta->UnpackDelta((CSnapshot *)m_aLastSnapshotData, pNewsnap, m_aChunkData, DataSize);
 
 			if(DataSize < 0)
 			{
@@ -700,17 +700,17 @@ void CDemoPlayer::DoTick()
 			else
 			{
 				if(m_pListener)
-					m_pListener->OnDemoPlayerSnapshot(m_aDeltaSnapshotData, DataSize);
+					m_pListener->OnDemoPlayerSnapshot(m_aSnapshot, DataSize);
 
 				m_LastSnapshotDataSize = DataSize;
-				mem_copy(m_aLastSnapshotData, m_aDeltaSnapshotData, DataSize);
+				mem_copy(m_aLastSnapshotData, m_aSnapshot, DataSize);
 				GotSnapshot = true;
 			}
 		}
 		else if(ChunkType == CHUNKTYPE_SNAPSHOT)
 		{
 			// process full snapshot
-			CSnapshot *pSnap = (CSnapshot *)m_aCurrentSnapshotData;
+			CSnapshot *pSnap = (CSnapshot *)m_aChunkData;
 			if(!pSnap->IsValid(DataSize))
 			{
 				if(m_pConsole)
@@ -725,9 +725,9 @@ void CDemoPlayer::DoTick()
 				GotSnapshot = true;
 
 				m_LastSnapshotDataSize = DataSize;
-				mem_copy(m_aLastSnapshotData, m_aCurrentSnapshotData, DataSize);
+				mem_copy(m_aLastSnapshotData, m_aChunkData, DataSize);
 				if(m_pListener)
-					m_pListener->OnDemoPlayerSnapshot(m_aCurrentSnapshotData, DataSize);
+					m_pListener->OnDemoPlayerSnapshot(m_aChunkData, DataSize);
 			}
 		}
 		else
@@ -748,7 +748,7 @@ void CDemoPlayer::DoTick()
 			else if(ChunkType == CHUNKTYPE_MESSAGE)
 			{
 				if(m_pListener)
-					m_pListener->OnDemoPlayerMessage(m_aCurrentSnapshotData, DataSize);
+					m_pListener->OnDemoPlayerMessage(m_aChunkData, DataSize);
 			}
 		}
 	}
diff --git a/src/engine/shared/demo.h b/src/engine/shared/demo.h
index c8060c541..da5a9883b 100644
--- a/src/engine/shared/demo.h
+++ b/src/engine/shared/demo.h
@@ -118,8 +118,13 @@ private:
 	CPlaybackInfo m_Info;
 	unsigned char m_aCompressedSnapshotData[CSnapshot::MAX_SIZE];
 	unsigned char m_aDecompressedSnapshotData[CSnapshot::MAX_SIZE];
-	unsigned char m_aCurrentSnapshotData[CSnapshot::MAX_SIZE];
-	unsigned char m_aDeltaSnapshotData[CSnapshot::MAX_SIZE];
+
+	// Depending on the chunk header
+	// this is either a full CSnapshot or a CSnapshotDelta.
+	unsigned char m_aChunkData[CSnapshot::MAX_SIZE];
+	// Storage for the full snapshot
+	// where the delta gets unpacked into.
+	unsigned char m_aSnapshot[CSnapshot::MAX_SIZE];
 	unsigned char m_aLastSnapshotData[CSnapshot::MAX_SIZE];
 	int m_LastSnapshotDataSize;
 	class CSnapshotDelta *m_pSnapshotDelta;