Clean up:

- Replace `size() == 0` by `empty()` - Replace `v[v.size() - 1]` by `v.back()`
Wargus · Apr 30, 2024 · fee78c1 · fee78c1
1 parent cd1f04a
commit fee78c1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/ai/ai_force.cpp b/src/ai/ai_force.cpp
@@ -412,10 +412,9 @@ bool AiForce::NewRallyPoint(const Vec2i &startPos, Vec2i *resultPos)
 
 void AiForce::Attack(const Vec2i &pos)
 {
-	bool isDefenceForce = false;
 	RemoveDeadUnit();
 
-	if (Units.size() == 0) {
+	if (Units.empty()) {
 		this->Attacking = false;
 		this->State = AiForceAttackingState::Waiting;
 		return;
@@ -424,7 +423,7 @@ void AiForce::Attack(const Vec2i &pos)
 		// Remember the original force position so we can return there after attack
 		if (this->Role == AiForceRole::Defend
 			|| (this->Role == AiForceRole::Attack && this->State == AiForceAttackingState::Waiting)) {
-			this->HomePos = this->Units[this->Units.size() - 1]->tilePos;
+			this->HomePos = this->Units.back()->tilePos;
 		}
 		this->Attacking = true;
 	}
@@ -436,6 +435,7 @@ void AiForce::Attack(const Vec2i &pos)
 	const bool isTransporter = ranges::any_of(this->Units, [](const CUnit *unit) {
 		return unit->Type->CanTransport() && unit->IsAgressive() == false;
 	});
+	bool isDefenceForce = false;
 	if (Map.Info.IsPointOnMap(goalPos) == false) {
 		/* Search in entire map */
 		const CUnit *enemy = nullptr;

diff --git a/src/unit/build.cpp b/src/unit/build.cpp
@@ -202,7 +202,7 @@ bool CBuildRestrictionHasUnit::Check(const CUnit *builder, const CUnitType &type
 	Vec2i pos2(0, 0);
 	CPlayer* player = builder != nullptr ? builder->Player : ThisPlayer;
 	int count = 0;
-	if (this->RestrictTypeOwner.size() == 0 || !this->RestrictTypeOwner.compare("self")) {
+	if (this->RestrictTypeOwner.empty() || !this->RestrictTypeOwner.compare("self")) {
 		count = player->GetUnitTotalCount(*this->RestrictType);
 	} else if (!this->RestrictTypeOwner.compare("allied")) {
 		count = player->GetUnitTotalCount(*this->RestrictType);
@@ -277,7 +277,7 @@ bool CBuildRestrictionSurroundedBy::Check(const CUnit *builder, const CUnitType
 			// unit has RestrictType or no RestrictType was set, but a RestrictTypeOwner
 			(this->RestrictType == unit->Type || (!this->RestrictType && this->RestrictTypeOwner.size() > 0)) &&
 			// RestrictTypeOwner is not set or unit belongs to a suitable player
-			(this->RestrictTypeOwner.size() == 0 ||
+			(this->RestrictTypeOwner.empty() ||
 				(!this->RestrictTypeOwner.compare("self") && builder->Player == unit->Player) ||
 				(!this->RestrictTypeOwner.compare("allied") && (builder->Player == unit->Player || builder->Player->IsAllied(*unit->Player))) ||
 				(!this->RestrictTypeOwner.compare("enemy") && builder->Player->IsEnemy(*unit->Player)))) {