Merge pull request #520 from Wargus/clean_up

Remove trailing space.

doc/lua/generate_index.py

@@ -132,7 +132,7 @@ def extract_docstring(filename, c_func):
 
 
 PLUGIN_PREAMBLE = r"""
--- Start copy from spec/lua.lua 
+-- Start copy from spec/lua.lua
 local unpack = table.unpack or unpack
 local funcdef = "([A-Za-z_][A-Za-z0-9_%.%:]*)%s*"
 local decindent = {

gameheaders/stratagus-game-launcher.h

@@ -456,7 +456,7 @@ static void ExtractData(char* extractor_tool, const char *const extractor_args[]
 
 #ifndef WIN32
 	if (!fs::exists(sourcepath)) {
-		// deployment time path might be same as extractor 
+		// deployment time path might be same as extractor
 		strcpy(sourcepath, fs::path(extractor_tool).parent_path().string().c_str());
 	}
 #endif

src/action/action_attack.cpp

@@ -234,7 +234,7 @@ PixelPos COrder_Attack::Show(const CViewport &vp,
 	bool isAttackMove = IsAutoTargeting();
 
 	targetPos = this->HasGoal() ? vp.MapToScreenPixelPos(this->GetGoal()->GetMapPixelPosCenter())
-								: IsMovingToAttackPos() ? vp.TilePosToScreen_Center(this->attackMovePos) 
+								: IsMovingToAttackPos() ? vp.TilePosToScreen_Center(this->attackMovePos)
 														: vp.TilePosToScreen_Center(this->goalPos);
 
 	orderedPos = isAttackMove ? vp.TilePosToScreen_Center(this->attackMovePos)
@@ -340,7 +340,7 @@ CUnit *COrder_Attack::BestTarget(const CUnit &unit, CUnit *const target1, CUnit
 	Assert(target1 != nullptr);
 	Assert(target2 != nullptr);
 
-	return (GameSettings.SimplifiedAutoTargeting 
+	return (GameSettings.SimplifiedAutoTargeting
 				? ((TargetPriorityCalculate(&unit, target1) > TargetPriorityCalculate(&unit, target2)) ? target1 : target2)
 				: ((ThreatCalculate(unit, *target1) < ThreatCalculate(unit, *target2)) ?  target1 : target2));
 }
@@ -356,7 +356,7 @@ void COrder_Attack::OfferNewTarget(const CUnit &unit, CUnit *const target)
 {
 	Assert(target != nullptr);
 	Assert(this->IsAutoTargeting() || unit.Player->AiEnabled);
-	
+
 	/// if attacker cant't move (stand_ground, building, in a bunker or transport)
 	const bool immobile = this->Action == UnitAction::StandGround || unit.Removed || !unit.CanMove();
 	if (immobile && !InAttackRange(unit, *target)) {
@@ -636,7 +636,7 @@ bool COrder_Attack::CheckForTargetInRange(CUnit &unit)
 
 /**
 **  Check if current target is closer to unit more than MinAttackRange
-**	
+**
 **  @param unit  Unit that is attacking and moving
 */
 bool COrder_Attack::IsTargetTooClose(const CUnit &unit) const
@@ -654,7 +654,7 @@ bool COrder_Attack::IsTargetTooClose(const CUnit &unit) const
 
 /**
 **  Controls moving a unit to position if its target is closer than MinAttackRange when attacking
-**	
+**
 **  @param unit  Unit that is attacking and moving
 **  @param pfReturn Current path finder status. Using to find new attack pos if current is unreachable.
 */
@@ -665,10 +665,10 @@ void COrder_Attack::MoveToAttackPos(CUnit &unit, const int pfReturn)
 	if (CheckForTargetInRange(unit)) {
 		return;
 	}
-	CUnit *goal 			 = this->GetGoal();
+	CUnit *goal = this->GetGoal();
 	/// When attack ground and moving to attack position, the target tile pos is stored in attackMovePos
-	const bool inAttackRange = goal ? InAttackRange(unit, *goal) 
-									: InAttackRange(unit, this->attackMovePos); 
+	const bool inAttackRange =
+		goal ? InAttackRange(unit, *goal) : InAttackRange(unit, this->attackMovePos);
 	if (!IsTargetTooClose(unit)) {
 		/// We have to restore original goalPos value
 		if (goal) {
@@ -690,7 +690,7 @@ void COrder_Attack::MoveToAttackPos(CUnit &unit, const int pfReturn)
 
 /**
 **  Controls moving a unit to its target when attacking
-**	
+**
 **  @param unit  Unit that is attacking and moving
 */
 void COrder_Attack::MoveToTarget(CUnit &unit)
@@ -710,7 +710,7 @@ void COrder_Attack::MoveToTarget(CUnit &unit)
 
 	if (needToSearchBetterPos) {
 		MoveToBetterPos(unit);
-		return;	
+		return;
 	}
 	/// Order may be set as finished by outside code while playing animation.
 	/// In this case we must not execute code of MoveToTarget
@@ -857,7 +857,7 @@ void COrder_Attack::AttackTarget(CUnit &unit)
 				return;
 			}
 			// Can we already attack ?
-			if ((this->HasGoal() && InAttackRange(unit, *this->GetGoal())) 
+			if ((this->HasGoal() && InAttackRange(unit, *this->GetGoal()))
 				|| (IsAttackGroundOrWall() && InAttackRange(unit, this->goalPos))) {
 
 				TurnToTarget(unit, this->GetGoal());
@@ -867,7 +867,7 @@ void COrder_Attack::AttackTarget(CUnit &unit)
 			}
 			this->State |= MOVE_TO_TARGET;
 		// FIXME: should use a reachable place to reduce pathfinder time.
-	
+
 		// FALL THROUGH
 		case MOVE_TO_TARGET:
 		case MOVE_TO_TARGET + AUTO_TARGETING:

src/action/action_build.cpp

@@ -292,9 +292,9 @@ CUnit *COrder_Build::CheckCanBuild(CUnit &unit)
 	CUnit *building = AlreadyBuildingFinder(unit, type).Find(Map.Field(pos));
 	if (building != nullptr) {
 		if (unit.CurrentOrder() == this) {
-			DebugPrint("%d: Worker [%d] is helping build: %s [%d]\n", 
-					   unit.Player->Index, unit.Slot, 
-					   building->Type->Name.c_str(), 
+			DebugPrint("%d: Worker [%d] is helping build: %s [%d]\n",
+					   unit.Player->Index, unit.Slot,
+					   building->Type->Name.c_str(),
 					   building->Slot);
 
 			delete this; // Bad
@@ -350,10 +350,10 @@ bool COrder_Build::StartBuilding(CUnit &unit, CUnit &ontop)
 			ontop.Release();
 		}
 	}
-	
-	if (type.BoolFlag[MAINFACILITY_INDEX].value 
-	&& CPlayer::IsRevelationEnabled() && unit.Player->LostMainFacilityTimer != 0 ) {
-		
+
+	if (type.BoolFlag[MAINFACILITY_INDEX].value && CPlayer::IsRevelationEnabled()
+	    && unit.Player->LostMainFacilityTimer != 0) {
+
 		unit.Player->LostMainFacilityTimer = 0;
 		unit.Player->SetRevealed(false);
 		for (int j = 0; j < NumPlayers; ++j) {

src/action/action_move.cpp

@@ -292,11 +292,11 @@ void COrder_Move::Execute(CUnit &unit) /* override */
 		case PF_REACHED:
 			this->Finished = true;
 			break;
-			
-		case PF_WAIT: 
+
+		case PF_WAIT:
 		{
 			const CUnit *blocker = UnitOnMapTile(this->goalPos, unit.Type->UnitType);
-			if (blocker) { 
+			if (blocker) {
 				const int distToBlocker = MapDistanceBetweenTypes(*(unit.Type), unit.tilePos, *(blocker->Type), blocker->tilePos);
 				if (distToBlocker == 1 && (unit.IsEnemy(*blocker) || blocker->Moving == 0)) {
 					unit.Wait = 0;

src/action/actions.cpp

@@ -292,7 +292,7 @@ static inline void IncreaseVariable(CUnit &unit, int index)
 {
 	unit.Variable[index].Value += unit.Variable[index].Increase;
 	clamp(&unit.Variable[index].Value, 0, unit.Variable[index].Max);
-	
+
 	//if variable is HP and increase is negative, unit dies if HP reached 0
 	if (index == HP_INDEX && unit.Variable[HP_INDEX].Value <= 0) {
 		LetUnitDie(unit);

src/action/command.cpp

@@ -924,8 +924,9 @@ void CommandSharedVision(int playerIndex, bool state, int opponentIndex)
 	CPlayer *player = &Players[playerIndex];
 	CPlayer *opponent = &Players[opponentIndex];
 
-	if (state == player->HasSharedVisionWith(*opponent) || opponent->Type == PlayerTypes::PlayerNobody 
-														|| player->Type == PlayerTypes::PlayerNobody) {
+	if (state == player->HasSharedVisionWith(*opponent)
+	    || opponent->Type == PlayerTypes::PlayerNobody
+	    || player->Type == PlayerTypes::PlayerNobody) {
 		return;
 	}
 
@@ -935,7 +936,7 @@ void CommandSharedVision(int playerIndex, bool state, int opponentIndex)
 			MapUnmarkUnitSight(*unit);
 		}
 	}
-	
+
 	if (state == false) {
 		player->UnshareVisionWith(*opponent);
 

src/ai/ai_force.cpp

@@ -867,24 +867,27 @@ static void AiGroupAttackerForTransport(AiForce &aiForce)
 			&& static_cast<COrder_Board *>(unit.CurrentOrder())->GetGoal() == &transporter) {
 			CommandFollow(transporter, unit, 0);
 		}
-		if (CanTransport(transporter, unit) && (unit.IsIdle() 
-			|| (unit.CurrentAction() == UnitAction::Board && !unit.Moving 
-			&& static_cast<COrder_Board *>(unit.CurrentOrder())->GetGoal() != &transporter)) && unit.Container == nullptr) {
-				CommandBoard(unit, transporter, FlushCommands);
-				CommandFollow(transporter, unit, 0);
-				if (--nbToTransport == 0) { // full : next transporter.
-					for (++transporterIndex; transporterIndex < aiForce.Size(); ++transporterIndex) {
-						const CUnit &nextTransporter = *aiForce.Units[transporterIndex];
-
-						if (nextTransporter.Type->CanTransport()) {
-							nbToTransport = nextTransporter.Type->MaxOnBoard - nextTransporter.BoardCount;
-							break ;
-						}
-					}
-					if (transporterIndex == aiForce.Size()) { // No more transporter.
-						break ;
+		if (CanTransport(transporter, unit)
+		    && (unit.IsIdle()
+		        || (unit.CurrentAction() == UnitAction::Board && !unit.Moving
+		            && static_cast<COrder_Board *>(unit.CurrentOrder())->GetGoal() != &transporter))
+		    && unit.Container == nullptr) {
+			CommandBoard(unit, transporter, FlushCommands);
+			CommandFollow(transporter, unit, 0);
+			if (--nbToTransport == 0) { // full : next transporter.
+				for (++transporterIndex; transporterIndex < aiForce.Size(); ++transporterIndex) {
+					const CUnit &nextTransporter = *aiForce.Units[transporterIndex];
+
+					if (nextTransporter.Type->CanTransport()) {
+						nbToTransport =
+							nextTransporter.Type->MaxOnBoard - nextTransporter.BoardCount;
+						break;
 					}
 				}
+				if (transporterIndex == aiForce.Size()) { // No more transporter.
+					break;
+				}
+			}
 		}
 	}
 }

src/ai/ai_magic.cpp

@@ -53,8 +53,6 @@ void AiCheckMagic()
 	CPlayer &player = *AiPlayer->Player;
 
 	for (CUnit *unit : player.GetUnits()) {
-
-
 		if (!unit->Type->CanCastSpell.empty()) {
 			// Check only idle magic units
 			for (const auto *order : unit->Orders) {

src/animation/animation_frame.cpp

@@ -47,7 +47,6 @@ void CAnimation_Frame::Action(CUnit &unit, int &/*move*/, int /*scale*/) const /
 	} else {
 		unit.Frame = ParseAnimInt(&unit);
 	}
-
 	UnitUpdateHeading(unit);
 }
 

src/animation/animation_rotate.cpp

@@ -65,7 +65,7 @@ void UnitRotate(CUnit &unit, int rotate)
 			target = order->GetGoal();
 			if (target->Destroyed) {
 				order->ClearGoal();
-				return;	
+				return;
 			}
 		} else if (unit.CurrentOrder()->Action == UnitAction::Build) {
 			target = static_cast<const COrder_Build *>(order)->GetBuildingUnit();