From 2c4fc340de958f6b94b40ee62eabff015625e62b Mon Sep 17 00:00:00 2001
From: Jammyjamjamman <jdsherratt3@gmail.com>
Date: Sat, 27 Jan 2018 15:59:58 +0000
Subject: [PATCH] Change the default command for attacking units to attack.

---
 source/glest_game/type_instances/unit.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/source/glest_game/type_instances/unit.cpp b/source/glest_game/type_instances/unit.cpp
index e36d2b8f9..6a1f1d336 100644
--- a/source/glest_game/type_instances/unit.cpp
+++ b/source/glest_game/type_instances/unit.cpp
@@ -2042,7 +2042,7 @@ void Unit::born(const CommandType *ct) {
 	checkItemInVault(&this->hp,this->hp);
 	int original_hp = this->hp;
 
-	
+
 	//set hp from start hp
 	checkItemInVault(&this->ep,this->ep);
 	if(type->getStartHpType() == UnitType::stValue) {
@@ -2251,9 +2251,10 @@ const CommandType *Unit::computeCommandType(const Vec2i &pos, const Unit *target
 		}
 	}
 
-	//default command is move command
+	// Default command is the class of the unit (i.e. attack for attackers, walk for walkers.
 	if(commandType == NULL) {
-		commandType= type->getFirstCtOfClass(ccMove);
+            // Is the unit class warrior? if yes, attack by default, else walk.
+            commandType = type->getFirstCtOfClass(this->getType()->isOfClass(ucWarrior) ? ccAttack : ccMove);
 	}
 
 	return commandType;
@@ -2731,7 +2732,7 @@ bool Unit::update() {
 		int64 heightFactor   = getHeightFactor(ANIMATION_SPEED_MULTIPLIER);
 		int64 speedDenominator = speedDivider *
 				game->getWorld()->getUpdateFps(this->getFactionIndex());
-		
+
 		// Override the animation speed for attacks that have upgraded the attack speed
 		int animSpeed = currSkill->getAnimSpeed();
 		if(currSkill->getClass() == scAttack) {