Compare commits

..
Author SHA1 Message Date
admin d5d0730c28 Use direct combat factory vector declarations 2026-06-23 13:03:15 -07:00
4 changed files with 4 additions and 4 deletions
@@ -172,7 +172,7 @@ auto SetUpController(
const std::string &serializedRequest,
const std::vector<std::pair<int32_t, std::vector<PlayerId>>> &watcherAllies)
-> std::shared_ptr<ShardokGameController> {
std::vector<Unit> unplacedUnits;
auto unplacedUnits = std::vector<Unit>();
unplacedUnits.reserve(units.size() + TutorialReinforcementUnitCount(tutorialConfig));
UnitId nextUnitId = 0;
@@ -73,7 +73,7 @@ auto main(const int argc, char **argv) -> int {
FilesystemUtils::SetExecPath(argv[0]);
std::vector<std::string> extraSettings;
auto extraSettings = std::vector<std::string>();
extraSettings.reserve(argc - 1);
for (int i = 1; i < argc; i++) { extraSettings.emplace_back(argv[i]); }
@@ -49,7 +49,7 @@ class ArcheryCommandFactoryTest : public ::testing::Test {
auto def1Offset = AddGenericUnit(1, 1, def1pos);
auto def2Offset = AddGenericUnit(1, 2, def2pos);
auto vec = vector<Unit>{attackerUnit, def1Offset, def2Offset};
vector<Unit> vec{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);
auto unitsVec = std::vector<Unit>{actorOff, defenderOff};
std::vector<Unit> unitsVec{actorOff, defenderOff};
auto unitsOff = fbb.CreateVectorOfSortedStructs(&unitsVec);
auto mapOff = AddBasicMap(fbb);