mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix nondeterministic CinemaManager serialization

Browse Source 
Fixes #8867
This commit is contained in:
7wells
2026-09-11 23:12:25 +02:00
committed by Vantha
parent fe144f1dc6
commit 779021c9dc
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation2/components/CCmpCinemaManager.cpp
+3 -7
View File
@@ -136,12 +136,8 @@ public:
const CMessageUpdate &msgData = static_cast<const CMessageUpdate&>(msg);
if (!m_IsPlayingPathQueue)
break;
// The paths play at a fixed speed, no matter the sim rate.
// The turn length we have received here, however, is scaled by that rate.
const fixed realTurnLength{msgData.turnLength / fixed::FromFloat(g_Game ? g_Game->GetSimRate() : 1.0f)};
m_QueuePlayingElapsedTime += realTurnLength;
m_ActivePathElapsedTime += realTurnLength;
m_QueuePlayingElapsedTime += msgData.turnLength;
m_ActivePathElapsedTime += msgData.turnLength;
if (m_ActivePathElapsedTime >= m_PathQueue.front().GetDuration())
{
CMessageCinemaPathEnded msgCinemaPathEnded(m_PathQueue.front().GetName());
@@ -265,7 +261,7 @@ public:
if (m_PathQueue.empty())
StopPlayingQueue();
else
m_PathQueue.front().Play(deltaRealTime, camera);
m_PathQueue.front().Play(deltaRealTime * g_Game->GetSimRate(), camera);
}
}