Always use latest armour upgrade value for already built droids.

This makes armour behave the same way for droids as for structures and features, and in line with every other upgrade.
Warzone2100 · Dec 29, 2015 · 01510e4 · 01510e4
1 parent d1f9747
commit 01510e4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/src/combat.cpp b/src/combat.cpp
@@ -345,7 +345,7 @@ int objArmour(BASE_OBJECT *psObj, WEAPON_CLASS weaponClass)
 	int armour = 0;
 	if (psObj->type == OBJ_DROID)
 	{
-		armour = ((DROID *)psObj)->armour[weaponClass];
+		armour = bodyArmour(asBodyStats + ((DROID *)psObj)->asBits[COMP_BODY], psObj->player, weaponClass);
 	}
 	else if (psObj->type == OBJ_STRUCTURE && weaponClass == WC_KINETIC && ((STRUCTURE *)psObj)->status != SS_BEING_BUILT)
 	{

diff --git a/src/droid.cpp b/src/droid.cpp
@@ -1796,7 +1796,6 @@ DROID *reallyBuildDroid(DROID_TEMPLATE *pTemplate, Position pos, UDWORD player,
 {
 	DROID			*psDroid;
 	DROID_GROUP		*psGrp;
-	UDWORD			inc;
 	SDWORD			i, experienceLoc;
 
 	// Don't use this assertion in single player, since droids can finish building while on an away mission
@@ -1868,11 +1867,6 @@ DROID *reallyBuildDroid(DROID_TEMPLATE *pTemplate, Position pos, UDWORD player,
 	ASSERT(psDroid->body > 0, "Invalid number of hitpoints");
 	psDroid->originalBody = psDroid->body;
 
-	for (inc = 0; inc < WC_NUM_WEAPON_CLASSES; inc++)
-	{
-		psDroid->armour[inc] = bodyArmour(asBodyStats + pTemplate->asParts[COMP_BODY], player, (WEAPON_CLASS)inc);
-	}
-
 	/* Set droid's initial illumination */
 	psDroid->sDisplay.imd = BODY_IMD(psDroid, psDroid->player);
 

diff --git a/src/droiddef.h b/src/droiddef.h
@@ -104,7 +104,6 @@ struct DROID : public BASE_OBJECT
 	uint32_t        experience;
 	UDWORD          lastFrustratedTime;             ///< Set when eg being stuck; used for eg firing indiscriminately at map features to clear the way
 	SWORD           resistance;                     ///< used in Electronic Warfare
-	UDWORD          armour[WC_NUM_WEAPON_CLASSES];
 	UDWORD          numWeaps;                       ///< Watermelon:Re-enabled this,I need this one in droid.c
 	WEAPON          asWeaps[DROID_MAXWEAPS];
 	// The group the droid belongs to