Compare commits

..
Author SHA1 Message Date
admin ea3252db90 Use direct vectors in game state helpers 2026-06-23 12:57:43 -07:00
4 changed files with 8 additions and 8 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;
@@ -67,7 +67,7 @@ void EXPECT_CONTAINS(const VecT& vec, const T& obj) {
template<class VecT, class F>
auto CHECK_NOCONTAINS_WHERE(const VecT& vec, F where) -> bool {
for (size_t i = 0; i < vec.size(); ++i) {
for (size_t i = 0; i < vec.size(); i++) {
if (where(vec[i])) {
std::cout << "Found at index " << i << '\n';
return false;
@@ -18,7 +18,7 @@ TEST(PercentileRollOddsTests, singleStat_returnsExpected) {
const std::vector<double> expectedBonuses =
{-25.0, -12.8, -3.125, -0.2, 0.0, 0.2, 3.125, 12.8, 25.0, 28.1216};
for (size_t i = 0; i < stats.size(); ++i) {
for (size_t i = 0; i < stats.size(); i++) {
EXPECT_DOUBLE_EQ(expectedBonuses[i], BonusFromStat(stats[i]));
}
}
@@ -85,7 +85,7 @@ TEST_F(UnitTests, giveCasualties_raisesMorale) {
}
TEST_F(UnitTests, Vigor_changesActionPoints) {
for (int i = 1; i < 100; ++i) {
for (int i = 1; i < 100; i++) {
Unit ui1 = GetUnitT1();
ui1.mutable_attached_hero().mutate_vigor(i);
ui1.mutable_battalion().mutate_morale(50);
@@ -115,7 +115,7 @@ TEST_F(UnitTests, MaxVigor_elevenActionPoints) {
}
TEST_F(UnitTests, Morale_changesActionPoints) {
for (int i = 1; i < 100; ++i) {
for (int i = 1; i < 100; i++) {
Unit ui1 = GetUnitT1();
ui1.mutable_attached_hero().mutate_vigor(50);
ui1.mutable_battalion().mutate_morale(i);