Compare commits

..
Author SHA1 Message Date
admin ea3252db90 Use direct vectors in game state helpers 2026-06-23 12:57:43 -07:00
3 changed files with 6 additions and 6 deletions
@@ -46,12 +46,12 @@ auto ConvertVictoryCondition(const net::eagle0::shardok::common::VictoryConditio
auto FromPlayerInfoProto(flatbuffers::FlatBufferBuilder& fbb, const PlayerInfoProto& piProto)
-> flatbuffers::Offset<net::eagle0::shardok::storage::fb::PlayerInfo> {
auto alliesVec = std::vector<AlliedPlayer>();
std::vector<AlliedPlayer> alliesVec;
alliesVec.reserve(piProto.allies_size());
for (const auto& apProto : piProto.allies()) { alliesVec.emplace_back(apProto.player_id()); }
const auto alliesOffset = fbb.CreateVectorOfStructs(alliesVec);
auto vcVec = std::vector<int8_t>();
std::vector<int8_t> vcVec;
const int victoryConditionCount = piProto.victory_conditions_size();
vcVec.reserve(victoryConditionCount);
for (int i = 0; i < victoryConditionCount; i++) {
@@ -142,7 +142,7 @@ auto SetupInitialGameState(
&endGameCondition);
auto gameIdOffset = fbb.CreateString(gameId);
auto playerInfoVec = std::vector<Offset<PlayerInfo>>();
std::vector<Offset<PlayerInfo>> playerInfoVec;
playerInfoVec.reserve(playerInfoProtos.size());
for (const auto& piProto : playerInfoProtos) {
playerInfoVec.push_back(FromPlayerInfoProto(fbb, piProto));
@@ -162,7 +162,7 @@ auto SetupInitialGameState(
// Add slack units: 3 per necromancer, minimum 5 for general use
const int slackUnits = std::max(5, necromancerCount * 3);
auto unitsVec = std::vector<Unit>();
std::vector<Unit> unitsVec;
unitsVec.reserve(units.size() + slackUnits);
for (const auto& unit : units) {
Unit modifiedUnit = unit;
@@ -49,7 +49,7 @@ class ArcheryCommandFactoryTest : public ::testing::Test {
auto def1Offset = AddGenericUnit(1, 1, def1pos);
auto def2Offset = AddGenericUnit(1, 2, def2pos);
vector<Unit> vec{attackerUnit, def1Offset, def2Offset};
auto vec = vector<Unit>{attackerUnit, def1Offset, def2Offset};
auto u = fbb.CreateVectorOfSortedStructs(&vec);
fbb.Finish(u);
@@ -22,7 +22,7 @@ class MeleeCommandFactoryTests : public ::testing::Test {
auto actorOff = AddGenericUnit(5, 0, position);
auto defenderOff = AddGenericUnit(3, 1, defenderPosition);
std::vector<Unit> unitsVec{actorOff, defenderOff};
auto unitsVec = std::vector<Unit>{actorOff, defenderOff};
auto unitsOff = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto mapOff = AddBasicMap(fbb);