Mex: Fix activation and propagation to neighbors (#521)

Metal Extractors are supposed to only work if they are activated,
regardless of onoffable state. If a metal extractor is activated or
deactivated, propagate this state to neighbor extractors properly.

Setting extraction during FinishedBuilding is replaced with Activate,
since even not ononffable Extractors still require being activated to
function (fixes a bug where metal and extraction map is corrupted due to
this)

rts/Sim/Units/Unit.h

@@ -104,8 +104,8 @@ class CUnit : public CSolidObject
 	// negative amount=reclaim, return= true -> build power was successfully applied
 	bool AddBuildPower(CUnit* builder, float amount);
 
-	void Activate();
-	void Deactivate();
+	virtual void Activate();
+	virtual void Deactivate();
 
 	void ForcedMove(const float3& newPos);
 

rts/Sim/Units/UnitTypes/ExtractorBuilding.cpp

@@ -41,6 +41,9 @@ CExtractorBuilding::~CExtractorBuilding()
 /* resets the metalMap and notifies the neighbours */
 void CExtractorBuilding::ResetExtraction()
 {
+	metalExtract = 0;
+	script->ExtractionRateChanged(metalExtract);
+
 	// undo the extraction-area
 	for (auto si = metalAreaOfControl.begin(); si != metalAreaOfControl.end(); ++si) {
 		metalMap.RemoveExtraction(si->x, si->z, si->extractionDepth);
@@ -148,19 +151,36 @@ void CExtractorBuilding::ReCalculateMetalExtraction()
 	for (MetalSquareOfControl& msqr: metalAreaOfControl) {
 		metalMap.RemoveExtraction(msqr.x, msqr.z, msqr.extractionDepth);
 
-		// extraction is done in a cylinder
-		msqr.extractionDepth = metalMap.RequestExtraction(msqr.x, msqr.z, extractionDepth);
-		metalExtract += (msqr.extractionDepth * metalMap.GetMetalAmount(msqr.x, msqr.z));
+		if (activated) {
+			// extraction is done in a cylinder
+			msqr.extractionDepth = metalMap.RequestExtraction(msqr.x, msqr.z, extractionDepth);
+			metalExtract += (msqr.extractionDepth * metalMap.GetMetalAmount(msqr.x, msqr.z));
+		}
 	}
 
 	// set the new rotation-speed
 	script->ExtractionRateChanged(metalExtract);
 }
 
 
-/* Finds the amount of metal to extract and sets the rotationspeed when the extractor is built. */
-void CExtractorBuilding::FinishedBuilding(bool postInit)
+void CExtractorBuilding::Activate()
 {
+	if (activated)
+		return;
+
+	CBuilding::Activate();
+
+	/* Finds the amount of metal to extract and sets the rotationspeed when the extractor is built. */
 	SetExtractionRangeAndDepth(unitDef->extractRange, unitDef->extractsMetal);
-	CUnit::FinishedBuilding(postInit);
+}
+
+
+void CExtractorBuilding::Deactivate()
+{
+	if (!activated)
+		return;
+
+	CBuilding::Deactivate();
+
+	ResetExtraction();
 }

rts/Sim/Units/UnitTypes/ExtractorBuilding.h

@@ -9,7 +9,7 @@
 
 class CExtractorBuilding : public CBuilding {
 public:
-	CR_DECLARE(CExtractorBuilding)
+	CR_DECLARE_DERIVED(CExtractorBuilding)
 	CR_DECLARE_SUB(MetalSquareOfControl)
 
 	CExtractorBuilding(): CBuilding() {
@@ -28,7 +28,8 @@ class CExtractorBuilding : public CBuilding {
 	float GetExtractionRange() const { return extractionRange; }
 	float GetExtractionDepth() const { return extractionDepth; }
 
-	void FinishedBuilding(bool postInit);
+	void Activate() override;
+	void Deactivate() override;
 
 protected:
 	struct MetalSquareOfControl {