Move check to see if metal should be shown inside SetShowingMetal.

beyond-all-reason · Dec 24, 2024 · 5f2e70a · 5f2e70a
1 parent 2c60e7e
commit 5f2e70a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 21 deletions.
diff --git a/rts/Game/UI/GuiHandler.cpp b/rts/Game/UI/GuiHandler.cpp
@@ -1010,21 +1010,27 @@ void CGuiHandler::ConvertCommands(std::vector<SCommandDescription>& cmds)
 }
 
 
-void CGuiHandler::SetShowingMetal(bool show)
+void CGuiHandler::SetShowingMetal(const SCommandDescription* cmdDesc)
 {
 	RECOIL_DETAILED_TRACY_ZONE;
-	if (!show) {
-		if (showingMetal) {
-			infoTextureHandler->DisableCurrentMode();
-			showingMetal = false;
-		}
-	} else {
-		if (autoShowMetal) {
-			if (infoTextureHandler->GetMode() != "metal") {
-				infoTextureHandler->SetMode("metal");
-				showingMetal = true;
-			}
-		}
+	if (!autoShowMetal || cmdDesc == nullptr) {
+		return;
+	}
+	bool show = false;
+	if (cmdDesc->type == CMDTYPE_ICON_BUILDING) {
+		const UnitDef* ud = unitDefHandler->GetUnitDefByID(-cmdDesc->id);
+		show = ud->extractsMetal > 0;
+	}
+
+	if (showingMetal && !show)
+	{
+		infoTextureHandler->DisableCurrentMode();
+		showingMetal = false;
+	}
+	else if (!showingMetal && infoTextureHandler->GetMode() != "metal")
+	{
+		infoTextureHandler->SetMode("metal");
+		showingMetal = true;
 	}
 }
 
@@ -1441,14 +1447,10 @@ void CGuiHandler::SetActiveCommandIndex(int newIndex)
 	if (inCommand != newIndex) {
 		inCommand = newIndex;
 		if (inCommand < commands.size()) {
-			const auto& cmd = commands[inCommand];
-			if (cmd.type == CMDTYPE_ICON_BUILDING) {
-				const UnitDef* ud = unitDefHandler->GetUnitDefByID(-cmd.id);
-				SetShowingMetal(ud->extractsMetal > 0);
-			}
-			eventHandler.ActiveCommandChanged(&cmd);
+			SetShowingMetal(&commands[inCommand]);
+			eventHandler.ActiveCommandChanged(&commands[inCommand]);
 		} else {
-			SetShowingMetal(false);
+			SetShowingMetal(nullptr);
 			eventHandler.ActiveCommandChanged(nullptr);
 		}
 

diff --git a/rts/Game/UI/GuiHandler.h b/rts/Game/UI/GuiHandler.h
@@ -123,7 +123,7 @@ class CGuiHandler : public CInputReceiver {
 	unsigned char CreateOptions(bool rightMouseButton);
 	unsigned char CreateOptions(int button);
 	void FinishCommand(int button);
-	void SetShowingMetal(bool show);
+	void SetShowingMetal(const SCommandDescription *cmdDesc);
 	float GetNumberInput(const SCommandDescription& cmdDesc) const;
 
 	void ProcessFrontPositions(float3& pos0, const float3& pos1);