Merge remote-tracking branch 'upstream/main'

2024-11-29 22:02:37 +01:00
parent 90a8c2711c 85617b7b4e
commit cd0f06f448
22 changed files with 214 additions and 38 deletions
@@ -106,11 +106,12 @@ class MainMenuState extends MusicBeatState
 				*/
 			}

-			if (controls.UP_P)
-				changeItem(-1);
+			var upP = controls.UP_P;
+			var downP = controls.DOWN_P;
+			var scroll = FlxG.mouse.wheel;

-			if (controls.DOWN_P)
-				changeItem(1);
+			if (upP || downP || scroll != 0)  // like this we wont break mods that expect a 0 change event when calling sometimes  - Nex
+				changeItem((upP ? -1 : 0) + (downP ? 1 : 0) - scroll);

 			if (controls.BACK)
 				FlxG.switchState(new TitleState());
@@ -124,9 +125,7 @@ class MainMenuState extends MusicBeatState
 			#end

 			if (controls.ACCEPT)
-			{
 				selectItem();
-			}
 		}

 		super.update(elapsed);