dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use std::optional for m_RejoinTestTurn

Browse source 
This removes a `-1` from #8468.
This commit is contained in:
phosit 2026-02-04 19:04:39 +01:00
parent df18e22277
commit 00f173685a
No known key found for this signature in database
GPG key ID: C9430B600671C268
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
source/simulation2/Simulation2.cpp
View file

@ -67,6 +67,7 @@
#include <js/RootingAPI.h>
#include <js/Value.h>
#include <memory>
#include <optional>
#include <set>
#include <sstream>
@ -85,12 +86,16 @@ public:
std::holds_alternative<SimulationDebugOptions::SerializationTest>(debugOptions.test) ||
CConfigDB::GetIfInitialised("serializationtest", false)},
// Handle bogus values of the arg
m_RejoinTestTurn{[&]
m_RejoinTestTurn{[&]() -> std::optional<int>
{
const auto* rejoinTestOption{
std::get_if<SimulationDebugOptions::RejoinTest>(&debugOptions.test)};
return rejoinTestOption ? rejoinTestOption->turn :
std::max(CConfigDB::GetIfInitialised("rejointest", -1), -1);
if (rejoinTestOption)
return rejoinTestOption->turn;
const int configVal{CConfigDB::GetIfInitialised("rejointest", -1)};
if (configVal >= 0)
return configVal;
return std::nullopt;
}()}
{
m_ComponentManager.LoadComponentTypes();
@ -160,7 +165,7 @@ public:
// Functions and data for the serialization test mode: (see Update() for relevant comments)
bool m_EnableSerializationTest{false};
int m_RejoinTestTurn{-1};
std::optional<int> m_RejoinTestTurn;
bool m_TestingRejoin{false};
// Secondary simulation (NB: order matters for destruction).
@ -387,7 +392,8 @@ void CSimulation2Impl::Update(int turnLength, const std::vector<SimulationComman
SerializationTestState primaryStateBefore;
const ScriptInterface& scriptInterface = m_ComponentManager.GetScriptInterface();
const bool startRejoinTest = (int64_t) m_RejoinTestTurn == m_TurnNumber;
const bool startRejoinTest = m_RejoinTestTurn.has_value() &&
static_cast<int64_t>(m_RejoinTestTurn.value()) == m_TurnNumber;
if (startRejoinTest)
m_TestingRejoin = true;
@ -866,7 +872,7 @@ bool CSimulation2::DeserializeState(std::istream& stream)
void CSimulation2::ActivateRejoinTest(int turn)
{
if (m->m_RejoinTestTurn != -1)
if (m->m_RejoinTestTurn.has_value())
return;
LOGMESSAGERENDER("Rejoin test will activate in %i turns", turn - m->m_TurnNumber);
m->m_RejoinTestTurn = turn;