Refactor show/hideInterface()

Warzone2100 · Oct 11, 2023 · 0c2b16d · 0c2b16d
1 parent 7b08363
commit 0c2b16d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/src/hci.cpp b/src/hci.cpp
@@ -3155,3 +3155,24 @@ bool intGetShouldShowRedundantDesign()
 {
 	return includeRedundantDesigns;
 }
+
+void intShowInterface()
+{
+	intAddReticule();
+	intShowPowerBar();
+	intShowGroupSelectionMenu();
+}
+
+void intHideInterface(bool forceHidePowerbar)
+{
+	intRemoveReticule();
+	if (forceHidePowerbar)
+	{
+		forceHidePowerBar();
+	}
+	else
+	{
+		intHidePowerBar();
+	}
+	intHideGroupSelectionMenu();
+}
diff --git a/src/hci.h b/src/hci.h
@@ -416,4 +416,7 @@ void intStartStructPosition(BASE_STATS *psStats);
 /* Remove the object widgets from the widget screen */
 void intRemoveObject();
 
+void intShowInterface();
+void intHideInterface(bool forceHidePowerbar = false);
+
 #endif // __INCLUDED_SRC_HCI_H__
diff --git a/src/wzapi.cpp b/src/wzapi.cpp
@@ -2812,9 +2812,7 @@ wzapi::no_return_value wzapi::showReticuleWidget(WZAPI_PARAMS(int buttonId))
 //--
 wzapi::no_return_value wzapi::showInterface(WZAPI_NO_PARAMS)
 {
-	intAddReticule();
-	intShowPowerBar();
-	intShowGroupSelectionMenu();
+	intShowInterface();
 	return {};
 }
 
@@ -2824,9 +2822,7 @@ wzapi::no_return_value wzapi::showInterface(WZAPI_NO_PARAMS)
 //--
 wzapi::no_return_value wzapi::hideInterface(WZAPI_NO_PARAMS)
 {
-	intRemoveReticule();
-	intHidePowerBar();
-	intHideGroupSelectionMenu();
+	intHideInterface();
 	return {};
 }