Skip to content

Commit

Permalink
options cam fix
Browse files Browse the repository at this point in the history
Co-authored-by: Gamadoge <[email protected]>
Co-authored-by: Gamadoge <[email protected]>
  • Loading branch information
3 people authored Jul 16, 2024
1 parent 557a7fc commit e408484
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
2 changes: 0 additions & 2 deletions source/Main.hx
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ class Main extends Sprite
game.debugger.interaction.addTool(new funkin.util.TrackerToolButtonUtil());
#end

addChild(fpsCounter);

#if hxcpp_debug_server
trace('hxcpp_debug_server is enabled! You can now connect to the game with a debugger.');
#else
Expand Down
6 changes: 3 additions & 3 deletions source/funkin/ui/options/ControlsMenu.hx
Original file line number Diff line number Diff line change
Expand Up @@ -158,17 +158,17 @@ class ControlsMenu extends funkin.ui.options.OptionsState.Page
menuCamera.follow(camFollow, null, 0.06);
var margin = 100;
menuCamera.deadzone.set(0, margin, menuCamera.width, menuCamera.height - margin * 2);
menuCamera.minScrollY = 0;

controlGrid.onChange.add(function(selected) {
camFollow.y = selected.y;

labels.forEach((label) -> label.alpha = 0.6);
labels.members[Std.int(controlGrid.selectedIndex / COLUMNS)].alpha = 1.0;
});

prompt = new Prompt("\nPress any key to rebind\n\n\nBackspace to unbind\n Escape to cancel", None);
prompt = new Prompt("\nPress any key to rebind\n\n\n Backspace to unbind\n Escape to cancel", None);
prompt.create();
prompt.createBgFromMargin(100, 0xFFfafd6d);
prompt.createBgFromMargin(75, 0xFFfafd6d);
prompt.back.scrollFactor.set(0, 0);
prompt.exists = false;
add(prompt);
Expand Down
5 changes: 2 additions & 3 deletions source/funkin/ui/options/PreferencesMenu.hx
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,8 @@ class PreferencesMenu extends Page
if (items != null) camFollow.y = items.selectedItem.y;

menuCamera.follow(camFollow, null, 0.06);
var margin = 160;
menuCamera.deadzone.set(0, margin, menuCamera.width, 40);
menuCamera.minScrollY = 0;
var margin = 100;
menuCamera.deadzone.set(0, margin, menuCamera.width, menuCamera.height - margin * 2);

items.onChange.add(function(selected) {
camFollow.y = selected.y;
Expand Down

0 comments on commit e408484

Please sign in to comment.