Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix crash on opening options menu in storyboard editor

Browse Source
This commit is contained in:
yugecin 2018-07-08 10:39:16 +02:00
parent 65017364bd
commit 5b129c10dd
No known key found for this signature in database
GPG Key ID: 2C5AC035A7068E44
2 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/yugecin/opsudance/options/OptionGroups.java
View File

@ -181,7 +181,8 @@ public class OptionGroups {
}; };
public static final OptionTab[] storyboardOptions = new OptionTab[] { public static final OptionTab[] storyboardOptions = new OptionTab[] {
new OptionTab("Gameplay", new Option[] { new OptionTab("Gameplay", GameImage.MENU_NAV_GAMEPLAY),
new OptionTab("GENERAL", new Option[] {
OPTION_BACKGROUND_DIM, OPTION_BACKGROUND_DIM,
OPTION_DANCE_REMOVE_BG, OPTION_DANCE_REMOVE_BG,
OPTION_SNAKING_SLIDERS, OPTION_SNAKING_SLIDERS,
@ -192,12 +193,14 @@ public class OptionGroups {
OPTION_SHOW_PERFECT_HIT, OPTION_SHOW_PERFECT_HIT,
OPTION_SHOW_FOLLOW_POINTS, OPTION_SHOW_FOLLOW_POINTS,
}), }),
new OptionTab("Input", new Option[] { new OptionTab("Input", GameImage.MENU_NAV_INPUT),
new OptionTab("INPUT", new Option[] {
OPTION_CURSOR_SIZE, OPTION_CURSOR_SIZE,
OPTION_NEW_CURSOR, OPTION_NEW_CURSOR,
OPTION_DISABLE_CURSOR OPTION_DISABLE_CURSOR
}), }),
new OptionTab("Dance", new Option[] { new OptionTab("Dance", GameImage.MENU_NAV_DANCE),
new OptionTab("MOVER", new Option[]{
OPTION_DANCE_MOVER, OPTION_DANCE_MOVER,
OPTION_DANCE_EXGON_DELAY, OPTION_DANCE_EXGON_DELAY,
OPTION_DANCE_QUAD_BEZ_AGGRESSIVENESS, OPTION_DANCE_QUAD_BEZ_AGGRESSIVENESS,
@ -206,36 +209,56 @@ public class OptionGroups {
OPTION_DANCE_QUAD_BEZ_CUBIC_AGGRESSIVENESS_FACTOR, OPTION_DANCE_QUAD_BEZ_CUBIC_AGGRESSIVENESS_FACTOR,
OPTION_DANCE_MOVER_DIRECTION, OPTION_DANCE_MOVER_DIRECTION,
OPTION_DANCE_SLIDER_MOVER_TYPE, OPTION_DANCE_SLIDER_MOVER_TYPE,
}),
new OptionTab("SPINNER", new Option[]{
OPTION_DANCE_SPINNER, OPTION_DANCE_SPINNER,
OPTION_DANCE_SPINNER_DELAY, OPTION_DANCE_SPINNER_DELAY,
}),
new OptionTab("SLIDER OPTIONS", new Option[]{
OPTION_DANCE_LAZY_SLIDERS, OPTION_DANCE_LAZY_SLIDERS,
OPTION_DANCE_CIRCLE_STREAMS,
OPTION_DANCE_ONLY_CIRCLE_STACKS,
OPTION_DANCE_CIRLCE_IN_SLOW_SLIDERS, OPTION_DANCE_CIRLCE_IN_SLOW_SLIDERS,
OPTION_DANCE_CIRLCE_IN_LAZY_SLIDERS, OPTION_DANCE_CIRLCE_IN_LAZY_SLIDERS,
}),
new OptionTab("CIRCLE MOVEMENTS", new Option[]{
OPTION_DANCE_CIRCLE_STREAMS,
OPTION_DANCE_ONLY_CIRCLE_STACKS,
}),
new OptionTab("MIRROR", new Option[] {
OPTION_DANCE_MIRROR, OPTION_DANCE_MIRROR,
}), }),
new OptionTab("Dance display", new Option[] { new OptionTab("Advanced Display", GameImage.MENU_NAV_ADVANCED),
new OptionTab("OBJECTS", new Option[]{
OPTION_DANCE_DRAW_APPROACH, OPTION_DANCE_DRAW_APPROACH,
OPTION_DANCE_OBJECT_COLOR_OVERRIDE, OPTION_DANCE_OBJECT_COLOR_OVERRIDE,
OPTION_DANCE_OBJECT_COLOR_OVERRIDE_MIRRORED, OPTION_DANCE_OBJECT_COLOR_OVERRIDE_MIRRORED,
OPTION_DANCE_RGB_OBJECT_INC, OPTION_DANCE_RGB_OBJECT_INC,
OPTION_DANCE_HIDE_OBJECTS,
}),
new OptionTab("CURSOR", new Option[]{
OPTION_DANCE_CURSOR_COLOR_OVERRIDE, OPTION_DANCE_CURSOR_COLOR_OVERRIDE,
OPTION_DANCE_CURSOR_MIRROR_COLOR_OVERRIDE, OPTION_DANCE_CURSOR_MIRROR_COLOR_OVERRIDE,
OPTION_DANCE_CURSOR_ONLY_COLOR_TRAIL, OPTION_DANCE_CURSOR_ONLY_COLOR_TRAIL,
OPTION_DANCE_RGB_CURSOR_INC, OPTION_DANCE_RGB_CURSOR_INC,
OPTION_DANCE_CURSOR_TRAIL_OVERRIDE, OPTION_DANCE_CURSOR_TRAIL_OVERRIDE,
OPTION_DANCE_HIDE_OBJECTS,
OPTION_DANCE_HIDE_UI,
}), }),
new OptionTab ("Pippi", new Option[] { new OptionTab("MISC", new Option[] {
OPTION_DANCE_HIDE_UI,
OPTION_DANCE_REMOVE_BG,
OPTION_DANCE_ENABLE_SB,
}),
new OptionTab ("Pippi", GameImage.MENU_NAV_PIPPI),
new OptionTab ("GENERAL", new Option[]{
OPTION_PIPPI_ENABLE, OPTION_PIPPI_ENABLE,
OPTION_PIPPI_RADIUS_PERCENT, OPTION_PIPPI_RADIUS_PERCENT,
}),
new OptionTab ("ANGLE MULTIPLIERS", new Option[]{
OPTION_PIPPI_ANGLE_INC_MUL, OPTION_PIPPI_ANGLE_INC_MUL,
OPTION_PIPPI_ANGLE_INC_MUL_SLIDER, OPTION_PIPPI_ANGLE_INC_MUL_SLIDER,
}),
new OptionTab ("MISC", new Option[] {
OPTION_PIPPI_SLIDER_FOLLOW_EXPAND, OPTION_PIPPI_SLIDER_FOLLOW_EXPAND,
OPTION_PIPPI_PREVENT_WOBBLY_STREAMS, OPTION_PIPPI_PREVENT_WOBBLY_STREAMS,
}) }),
}; };
} }

4
src/yugecin/opsudance/ui/StoryboardOverlay.java
View File

@ -1,6 +1,6 @@
/* /*
* opsu!dance - fork of opsu! with cursordance auto * opsu!dance - fork of opsu! with cursordance auto
* Copyright (C) 2016 yugecin * Copyright (C) 2016-2018 yugecin
* *
* opsu!dance is free software: you can redistribute it and/or modify * opsu!dance is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -55,9 +55,11 @@ public class StoryboardOverlay extends OverlayOpsuState implements OptionsOverla
static { static {
for (OptionTab tab : OptionGroups.storyboardOptions) { for (OptionTab tab : OptionGroups.storyboardOptions) {
if (tab.options != null) {
optionList.addAll(Arrays.asList(tab.options)); optionList.addAll(Arrays.asList(tab.options));
} }
} }
}
public StoryboardOverlay(MoveStoryboard msb, OptionsOverlay optionsOverlay, Game game) { public StoryboardOverlay(MoveStoryboard msb, OptionsOverlay optionsOverlay, Game game) {
this.msb = msb; this.msb = msb;