Use turn_id_t (int32_t) for turn-count across simulation, network and replay
CSimulation2 used , CSimulation2Impl mixed /, and
CTurnManager used for the same turn-count concept, forcing a
static_cast<int64_t> at the one place these types already met
(rejoin-test comparison).
Add (alias for std::int32_t) in SimulationCommand.h and use
it consistently for every turn counter in CSimulation2/Impl,
CTurnManager and its subclasses (CLocalTurnManager,
CReplayTurnManager), CNetServerTurnManager/CNetClientTurnManager, and
the network wire format (m_Turn in CEndCommandBatchMessage,
CSimulationMessage, CSyncCheckMessage, CSyncErrorMessage, and
m_CurrentTurn in CLoadedGameMessage).
Turn *duration* fields (m_TurnLength, m_CommandDelay,
DEFAULT_TURN_LENGTH, COMMAND_DELAY_SP/MP, SetTurnLength,
GetSavedTurnLength return type) are left as u32 — they're milliseconds,
not a counter, and out of scope here.
Remaining turn_id_t vs size_t comparisons use std::cmp_equal or
explicit casts, matching the existing pattern in Simulation2.cpp.
Fixes #8718
2026-06-26 21:04:27 -07:00
|
|
|
/* Copyright (C) 2026 Wildfire Games.
|
2023-12-02 16:30:12 -08:00
|
|
|
* This file is part of 0 A.D.
|
2010-05-19 17:59:01 -07:00
|
|
|
*
|
2023-12-02 16:30:12 -08:00
|
|
|
* 0 A.D. is free software: you can redistribute it and/or modify
|
2010-05-19 17:59:01 -07:00
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
2023-12-02 16:30:12 -08:00
|
|
|
* 0 A.D. is distributed in the hope that it will be useful,
|
2010-05-19 17:59:01 -07:00
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
2023-12-02 16:30:12 -08:00
|
|
|
* along with 0 A.D. If not, see <http://www.gnu.org/licenses/>.
|
2010-05-19 17:59:01 -07:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#ifndef INCLUDED_SIMULATIONCOMMAND
|
|
|
|
|
#define INCLUDED_SIMULATIONCOMMAND
|
|
|
|
|
|
2011-01-12 04:29:00 -08:00
|
|
|
#include "simulation2/helpers/Player.h"
|
2010-05-19 17:59:01 -07:00
|
|
|
|
2025-08-07 10:53:23 -07:00
|
|
|
#include <js/RootingAPI.h>
|
|
|
|
|
#include <js/TypeDecls.h>
|
|
|
|
|
#include <js/Value.h>
|
|
|
|
|
|
Use turn_id_t (int32_t) for turn-count across simulation, network and replay
CSimulation2 used , CSimulation2Impl mixed /, and
CTurnManager used for the same turn-count concept, forcing a
static_cast<int64_t> at the one place these types already met
(rejoin-test comparison).
Add (alias for std::int32_t) in SimulationCommand.h and use
it consistently for every turn counter in CSimulation2/Impl,
CTurnManager and its subclasses (CLocalTurnManager,
CReplayTurnManager), CNetServerTurnManager/CNetClientTurnManager, and
the network wire format (m_Turn in CEndCommandBatchMessage,
CSimulationMessage, CSyncCheckMessage, CSyncErrorMessage, and
m_CurrentTurn in CLoadedGameMessage).
Turn *duration* fields (m_TurnLength, m_CommandDelay,
DEFAULT_TURN_LENGTH, COMMAND_DELAY_SP/MP, SetTurnLength,
GetSavedTurnLength return type) are left as u32 — they're milliseconds,
not a counter, and out of scope here.
Remaining turn_id_t vs size_t comparisons use std::cmp_equal or
explicit casts, matching the existing pattern in Simulation2.cpp.
Fixes #8718
2026-06-26 21:04:27 -07:00
|
|
|
/**
|
|
|
|
|
* At 1000 turns/second, a 32-bit counter would overflow in ~49 days.
|
|
|
|
|
* No overflow checks are needed.
|
|
|
|
|
*/
|
|
|
|
|
using turn_id_t = std::int32_t;
|
|
|
|
|
|
2025-08-07 10:53:23 -07:00
|
|
|
struct JSContext;
|
|
|
|
|
|
2010-05-19 17:59:01 -07:00
|
|
|
/**
|
|
|
|
|
* Simulation command, typically received over the network in multiplayer games.
|
|
|
|
|
*/
|
|
|
|
|
struct SimulationCommand
|
|
|
|
|
{
|
2015-01-24 06:46:52 -08:00
|
|
|
SimulationCommand(player_id_t player, JSContext* cx, JS::HandleValue val)
|
|
|
|
|
: player(player), data(cx, val)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
SimulationCommand(SimulationCommand&& cmd)
|
|
|
|
|
: player(cmd.player), data(cmd.data)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// std::vector::insert requires the move assignment operator at compilation time,
|
|
|
|
|
// but apparently never uses it (it uses the move constructor).
|
|
|
|
|
SimulationCommand& operator=(SimulationCommand&& other)
|
|
|
|
|
{
|
|
|
|
|
this->player = other.player;
|
2016-09-02 09:24:46 -07:00
|
|
|
this->data = other.data;
|
2015-01-24 06:46:52 -08:00
|
|
|
return *this;
|
|
|
|
|
}
|
|
|
|
|
|
2011-01-12 04:29:00 -08:00
|
|
|
player_id_t player;
|
2015-01-24 06:46:52 -08:00
|
|
|
JS::PersistentRootedValue data;
|
2010-05-19 17:59:01 -07:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#endif // INCLUDED_SIMULATIONCOMMAND
|