From fc08fe60ab56662c1af39c6e7a1a09da4e801d86 Mon Sep 17 00:00:00 2001 From: elexis Date: Thu, 26 Sep 2019 12:09:19 +0000 Subject: [PATCH] Support testing rejoins on turn 0, refs #3460, #4242, #5185, #5162, 2bf1dbfd13 Differential Revision: https://code.wildfiregames.com/D1522 This was SVN commit r22998. --- source/ps/Replay.cpp | 2 +- source/simulation2/Simulation2.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/ps/Replay.cpp b/source/ps/Replay.cpp index 1a051c6171..ce6a138eb2 100644 --- a/source/ps/Replay.cpp +++ b/source/ps/Replay.cpp @@ -215,7 +215,7 @@ void CReplayPlayer::Replay(const bool serializationtest, const int rejointesttur g_Game = new CGame(false); if (serializationtest) g_Game->GetSimulation2()->EnableSerializationTest(); - if (rejointestturn > 0) + if (rejointestturn >= 0) g_Game->GetSimulation2()->EnableRejoinTest(rejointestturn); if (ooslog) g_Game->GetSimulation2()->EnableOOSLog(); diff --git a/source/simulation2/Simulation2.cpp b/source/simulation2/Simulation2.cpp index 4ec71c1190..955dedc0e1 100644 --- a/source/simulation2/Simulation2.cpp +++ b/source/simulation2/Simulation2.cpp @@ -67,7 +67,7 @@ public: CFG_GET_VAL("ooslog", m_EnableOOSLog); CFG_GET_VAL("serializationtest", m_EnableSerializationTest); CFG_GET_VAL("rejointest", m_RejoinTestTurn); - if (m_RejoinTestTurn <= 0) // Handle bogus values of the arg + if (m_RejoinTestTurn < 0) // Handle bogus values of the arg m_RejoinTestTurn = -1; }