edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-18 14:08:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use member variables for demo player snapshot data

Browse source 
Use member instead of static variables for demo player snapshot data. The static variables would otherwise cause issues when multiple demo players are playing at the same time, especially demo players used in background jobs for replay demo slicing. This hopefully closes #7068.
This commit is contained in:
Robert Müller 2023-10-11 23:45:50 +02:00
parent 90466689d3
commit 668e6fb14e
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/engine/shared/demo.cpp
View file

@ -587,11 +587,9 @@ void CDemoPlayer::DoTick()
// read the chunk // read the chunk
int DataSize = 0; int DataSize = 0;
static char s_aData[CSnapshot::MAX_SIZE];
if(ChunkSize) if(ChunkSize)
{ {
static char s_aCompresseddata[CSnapshot::MAX_SIZE]; if(io_read(m_File, m_aCompressedSnapshotData, ChunkSize) != (unsigned)ChunkSize)
if(io_read(m_File, s_aCompresseddata, ChunkSize) != (unsigned)ChunkSize)
{ {
// stop on error or eof // stop on error or eof
if(m_pConsole) if(m_pConsole)
@ -600,8 +598,7 @@ void CDemoPlayer::DoTick()
break; break;
} }
static char s_aDecompressed[CSnapshot::MAX_SIZE]; DataSize = CNetBase::Decompress(m_aCompressedSnapshotData, ChunkSize, m_aDecompressedSnapshotData, sizeof(m_aDecompressedSnapshotData));
DataSize = CNetBase::Decompress(s_aCompresseddata, ChunkSize, s_aDecompressed, sizeof(s_aDecompressed));
if(DataSize < 0) if(DataSize < 0)
{ {
// stop on error or eof // stop on error or eof
@ -611,7 +608,7 @@ void CDemoPlayer::DoTick()
break; break;
} }
DataSize = CVariableInt::Decompress(s_aDecompressed, DataSize, s_aData, sizeof(s_aData)); DataSize = CVariableInt::Decompress(m_aDecompressedSnapshotData, DataSize, m_aCurrentSnapshotData, sizeof(m_aCurrentSnapshotData));
if(DataSize < 0) if(DataSize < 0)
{ {
@ -625,9 +622,8 @@ void CDemoPlayer::DoTick()
if(ChunkType == CHUNKTYPE_DELTA) if(ChunkType == CHUNKTYPE_DELTA)
{ {
// process delta snapshot // process delta snapshot
static char s_aNewsnap[CSnapshot::MAX_SIZE]; CSnapshot *pNewsnap = (CSnapshot *)m_aDeltaSnapshotData;
CSnapshot *pNewsnap = (CSnapshot *)s_aNewsnap; DataSize = m_pSnapshotDelta->UnpackDelta((CSnapshot *)m_aLastSnapshotData, pNewsnap, m_aCurrentSnapshotData, DataSize);
DataSize = m_pSnapshotDelta->UnpackDelta((CSnapshot *)m_aLastSnapshotData, pNewsnap, s_aData, DataSize);
if(DataSize < 0) if(DataSize < 0)
{ {
@ -650,17 +646,17 @@ void CDemoPlayer::DoTick()
else else
{ {
if(m_pListener) if(m_pListener)
m_pListener->OnDemoPlayerSnapshot(s_aNewsnap, DataSize); m_pListener->OnDemoPlayerSnapshot(m_aDeltaSnapshotData, DataSize);
m_LastSnapshotDataSize = DataSize; m_LastSnapshotDataSize = DataSize;
mem_copy(m_aLastSnapshotData, s_aNewsnap, DataSize); mem_copy(m_aLastSnapshotData, m_aDeltaSnapshotData, DataSize);
GotSnapshot = true; GotSnapshot = true;
} }
} }
else if(ChunkType == CHUNKTYPE_SNAPSHOT) else if(ChunkType == CHUNKTYPE_SNAPSHOT)
{ {
// process full snapshot // process full snapshot
CSnapshot *pSnap = (CSnapshot *)s_aData; CSnapshot *pSnap = (CSnapshot *)m_aCurrentSnapshotData;
if(!pSnap->IsValid(DataSize)) if(!pSnap->IsValid(DataSize))
{ {
if(m_pConsole) if(m_pConsole)
@ -675,9 +671,9 @@ void CDemoPlayer::DoTick()
GotSnapshot = true; GotSnapshot = true;
m_LastSnapshotDataSize = DataSize; m_LastSnapshotDataSize = DataSize;
mem_copy(m_aLastSnapshotData, s_aData, DataSize); mem_copy(m_aLastSnapshotData, m_aCurrentSnapshotData, DataSize);
if(m_pListener) if(m_pListener)
m_pListener->OnDemoPlayerSnapshot(s_aData, DataSize); m_pListener->OnDemoPlayerSnapshot(m_aCurrentSnapshotData, DataSize);
} }
} }
else else
@ -698,7 +694,7 @@ void CDemoPlayer::DoTick()
else if(ChunkType == CHUNKTYPE_MESSAGE) else if(ChunkType == CHUNKTYPE_MESSAGE)
{ {
if(m_pListener) if(m_pListener)
m_pListener->OnDemoPlayerMessage(s_aData, DataSize); m_pListener->OnDemoPlayerMessage(m_aCurrentSnapshotData, DataSize);
} }
} }
} }

4
src/engine/shared/demo.h
View file

@ -114,6 +114,10 @@ private:
CPlaybackInfo m_Info; CPlaybackInfo m_Info;
int m_DemoType; int m_DemoType;
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];
unsigned char m_aLastSnapshotData[CSnapshot::MAX_SIZE]; unsigned char m_aLastSnapshotData[CSnapshot::MAX_SIZE];
int m_LastSnapshotDataSize; int m_LastSnapshotDataSize;
class CSnapshotDelta *m_pSnapshotDelta; class CSnapshotDelta *m_pSnapshotDelta;