groups menu is enabled only when the option is set in menu

Warzone2100 · Aug 27, 2023 · 1366dd6 · 1366dd6
1 parent 2569a42
commit 1366dd6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/hci.cpp b/src/hci.cpp
@@ -2012,12 +2012,14 @@ void intAlliedResearchChanged()
 
 bool intShowGroupSelectionMenu()
 {
-	// TODO set if statement, if enabled in options
-	GroupsForum* groupsForum = (GroupsForum*)widgGetFromID(psWScreen, IDOBJ_GROUP);
-	if (!groupsForum)
+	if (getGroupButtonEnabled())
 	{
-		auto newGroupsForum = GroupsForum::make();
-		psWScreen->psForm->attach(newGroupsForum);
+		GroupsForum* groupsForum = (GroupsForum*)widgGetFromID(psWScreen, IDOBJ_GROUP);
+		if (!groupsForum)
+		{
+			auto newGroupsForum = GroupsForum::make();
+			psWScreen->psForm->attach(newGroupsForum);
+		}
 	}
 	return true;
 }

diff --git a/src/hci/objects_stats.cpp b/src/hci/objects_stats.cpp
@@ -220,9 +220,8 @@ void ObjectsForm::initialize()
 {
 	// creating an obj stat form
 	id = IDOBJ_FORM;
-	// TODO set if statement, subtract the 80 if enabled in options
 	setCalcLayout(LAMBDA_CALCLAYOUT_SIMPLE({
-		psWidget->setGeometry(OBJ_BACKX, OBJ_BACKY - 80, OBJ_BACKWIDTH, OBJ_BACKHEIGHT);
+		psWidget->setGeometry(OBJ_BACKX, OBJ_BACKY - (getGroupButtonEnabled() ? 80 : 0), OBJ_BACKWIDTH, OBJ_BACKHEIGHT);
 	}));
 
 	addCloseButton();