MenuVars Struct - Remove unused variable

Zephiles · Zephiles · commit 3dfb092c6f9f · 2020-03-06T22:29:06.000-06:00
diff --git a/ttyd-tools/rel/include/global.h b/ttyd-tools/rel/include/global.h
@@ -500,7 +500,6 @@ struct MenuVars
 {
 	bool HideMenu;
 	bool MenuIsDisplayed;
-	bool PreventClosingMenu;
 	bool ChangingCheatButtonCombo;
 	uint8_t CurrentMenu;
 	uint8_t CurrentMenuOption;
diff --git a/ttyd-tools/rel/source/menu.cpp b/ttyd-tools/rel/source/menu.cpp
@@ -3861,7 +3861,7 @@ void enableOrDisableMenu()
 	uint32_t OpenMenuCombo = PAD_L | PAD_START;
 	bool tempMenuIsDisplayed = MenuVar.MenuIsDisplayed;
 	
-	if (checkButtonCombo(OpenMenuCombo) && !MenuVar.PreventClosingMenu && !MenuVar.ChangingCheatButtonCombo)
+	if (checkButtonCombo(OpenMenuCombo) && !MenuVar.ChangingCheatButtonCombo)
 	{
 		resetMenuToRoot();
 		tempMenuIsDisplayed = !tempMenuIsDisplayed;

Original file line number	Diff line number	Diff line change
`@@ -500,7 +500,6 @@ struct MenuVars`
`500`	`500`	`{`
`501`	`501`	`bool HideMenu;`
`502`	`502`	`bool MenuIsDisplayed;`
`503`		`- bool PreventClosingMenu;`
`504`	`503`	`bool ChangingCheatButtonCombo;`
`505`	`504`	`uint8_t CurrentMenu;`
`506`	`505`	`uint8_t CurrentMenuOption;`
Original file line number	Diff line number	Diff line change
`@@ -3861,7 +3861,7 @@ void enableOrDisableMenu()`
`3861`	`3861`	`uint32_t OpenMenuCombo = PAD_L \| PAD_START;`
`3862`	`3862`	`bool tempMenuIsDisplayed = MenuVar.MenuIsDisplayed;`
`3863`	`3863`
`3864`		`- if (checkButtonCombo(OpenMenuCombo) && !MenuVar.PreventClosingMenu && !MenuVar.ChangingCheatButtonCombo)`
	`3864`	`+ if (checkButtonCombo(OpenMenuCombo) && !MenuVar.ChangingCheatButtonCombo)`
`3865`	`3865`	`{`
`3866`	`3866`	`resetMenuToRoot();`
`3867`	`3867`	`tempMenuIsDisplayed = !tempMenuIsDisplayed;`