STRUCTURE: change structIsDamaged() free function into `isDamaged()…

…` member function

Signed-off-by: Pavel Solodovnikov <[email protected]>

src/order.cpp

@@ -319,7 +319,7 @@ static std::pair<STRUCTURE *, DROID_ACTION> checkForDamagedStruct(DROID *psDroid
 		}
 
 		// Check for structures to repair.
-		if (structure->status == SS_BUILT && structIsDamaged(structure))
+		if (structure->status == SS_BUILT && structure->isDamaged())
 		{
 			bestDistanceSq = distanceSq;
 			best = {structure, DACTION_REPAIR};

src/structure.cpp

@@ -6735,9 +6735,9 @@ bool vtolOnRearmPad(const STRUCTURE *psStruct, const DROID *psDroid)
 
 
 /* Just returns true if the structure's present body points aren't as high as the original*/
-bool	structIsDamaged(const STRUCTURE *psStruct)
+bool	STRUCTURE::isDamaged() const
 {
-	return psStruct->body < psStruct->structureBody();
+	return body < structureBody();
 }
 
 // give a structure from one player to another - used in Electronic Warfare

src/structure.h

@@ -307,9 +307,6 @@ void ensureRearmPadClear(STRUCTURE *psStruct, DROID *psDroid);
 // return whether a rearm pad has a vtol on it
 bool vtolOnRearmPad(const STRUCTURE *psStruct, const DROID *psDroid);
 
-/* Just returns true if the structure's present body points aren't as high as the original*/
-bool	structIsDamaged(const STRUCTURE *psStruct);
-
 // give a structure from one player to another - used in Electronic Warfare
 STRUCTURE *giftSingleStructure(STRUCTURE *psStructure, UBYTE attackPlayer, bool electronic_warfare = true);
 

src/structuredef.h

@@ -285,6 +285,8 @@ struct STRUCTURE : public BASE_OBJECT
 	// Return true if structure is a factory of any type.
 	bool isFactory() const;
 	uint32_t structureBody() const;
+	// Just returns true if the structure's present body points aren't as high as the original
+	bool isDamaged() const;
 
 	STRUCTURE_STATS     *pStructureType;            /* pointer to the structure stats for this type of building */
 	STRUCT_STATES       status;                     /* defines whether the structure is being built, doing nothing or performing a function */