Cheats Menu - Allow other displays to be shown while the menu for spawning items is displayed

Author: Zephiles

ttyd-tools/rel/source/codes.cpp

@@ -571,7 +571,9 @@ void reloadRoom()
 	if (!MenuVar.ChangingCheatButtonCombo && checkButtonCombo(Cheat[RELOAD_ROOM].ButtonCombo))
 	{
 		// Prevent being able to reload the room if the menu is open or if currently in the spawn item menu
-		if (Cheat[RELOAD_ROOM].Active && !MenuVar.MenuIsDisplayed && !SpawnItem.InAdjustableValueMenu)
+		if (Cheat[RELOAD_ROOM].Active && 
+			!MenuVar.MenuIsDisplayed && 
+			!SpawnItem.InAdjustableValueMenu)
 		{
 			reloadRoomMain();
 		}
@@ -817,7 +819,7 @@ void spawnItem()
 		}
 
 		// Draw the menu
-		drawFunctionOnDebugLayer(drawAdjustableValueSpawnItem);
+		drawFunctionOnDebugLayerWithOrder(drawAdjustableValueSpawnItem, 10.f);
 	}
 	else if (tempInAdjustableValueMenu)
 	{

ttyd-tools/rel/source/main.cpp

@@ -799,8 +799,7 @@ void Mod::run()
 
 	// Check if the menu should be enabled or disabled
 	// Prevent checking it if currently in the process of spawning an item
-	bool CurrentlySpawningItem = SpawnItem.InAdjustableValueMenu;
-	if (!CurrentlySpawningItem)
+	if (!SpawnItem.InAdjustableValueMenu)
 	{
 		enableOrDisableMenu();
 	}
@@ -834,8 +833,7 @@ void Mod::run()
 	if (!MenuVar.MenuIsDisplayed || MenuVar.HideMenu)
 	{
 		// Don't display some displays if the Guard/Superguard timings display is active
-		// Don't display some displays if current in the process of spawning an item
-		if ((DisplayActionCommands.DisplayTimer == 0) && !CurrentlySpawningItem)
+		if (DisplayActionCommands.DisplayTimer == 0)
 		{
 			// Only run button-based displays if currently not changing button combos
 			if (!tempChangingCheatButtonCombo)
@@ -857,14 +855,9 @@ void Mod::run()
 		// Only run button-based displays if currently not changing button combos
 		if (!tempChangingCheatButtonCombo)
 		{
-			// Don't display some displays if current in the process of spawning an item
-			if (!CurrentlySpawningItem)
-			{
-				displayOnScreenTimer();
-				displayFrameCounter();
-				displayJumpStorageDetails();
-			}
-			
+			displayOnScreenTimer();
+			displayFrameCounter();
+			displayJumpStorageDetails();
 			displayButtonInputs();
 		}
 

ttyd-tools/rel/source/menufunctions.cpp

@@ -4175,9 +4175,8 @@ void updateOnScreenTimerVars()
 	if (PreviousFrameTime != 0)
 	{
 		if (!OnScreenTimer.TimerPaused && 
-		(!MenuVar.MenuIsDisplayed || MenuVar.HideMenu) && 
-		!SpawnItem.InAdjustableValueMenu && 
-		!MenuVar.ChangingCheatButtonCombo)
+			(!MenuVar.MenuIsDisplayed || MenuVar.HideMenu) && 
+			!MenuVar.ChangingCheatButtonCombo)
 		{
 			int64_t IncrementAmount = CurrentFrameTime - PreviousFrameTime;
 			OnScreenTimer.MainTimer += IncrementAmount;