Skip to content

Commit ea7e448

Browse files
committed
Disabled most displays when in the process of spawning an item
Most of them tend to be drawn on top of the adjustable value menu, so they should be disabled.
1 parent be09462 commit ea7e448

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

ttyd-tools/rel/source/main.cpp

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -706,7 +706,8 @@ void Mod::run()
706706

707707
// Check if the menu should be enabled or disabled
708708
// Prevent checking it if currently in the process of spawning an item
709-
if (!SpawnItem.InAdjustableValueMenu)
709+
bool CurrentlySpawningItem = SpawnItem.InAdjustableValueMenu;
710+
if (!CurrentlySpawningItem)
710711
{
711712
enableOrDisableMenu();
712713
}
@@ -739,7 +740,8 @@ void Mod::run()
739740
if (!MenuIsDisplayed || HideMenu)
740741
{
741742
// Don't display some displays if the Guard/Superguard timings display is active
742-
if (DisplayActionCommands.DisplayTimer == 0)
743+
// Don't display some displays if current in the process of spawning an item
744+
if ((DisplayActionCommands.DisplayTimer == 0) && !CurrentlySpawningItem)
743745
{
744746
// Only run button-based codes if currently not changing button combos
745747
if (!tempChangingCheatButtonCombo)
@@ -758,8 +760,13 @@ void Mod::run()
758760
// Only run button-based codes if currently not changing button combos
759761
if (!tempChangingCheatButtonCombo)
760762
{
761-
displayOnScreenTimer();
762-
displayJumpStorageDetails();
763+
// Don't display some displays if current in the process of spawning an item
764+
if (!CurrentlySpawningItem)
765+
{
766+
displayOnScreenTimer();
767+
displayJumpStorageDetails();
768+
}
769+
763770
displayButtonInputs();
764771
}
765772

0 commit comments

Comments
 (0)