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

fix nullpointer for mover storyboard

Browse Source
This commit is contained in:
yugecin
2017-01-21 13:29:10 +01:00
parent 4dc8b34557
commit b2f85edb13
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/itdelatrisu/opsu/states/Game.java
View File

@@ -333,6 +333,8 @@ public class Game extends ComplexOpsuState {
@Override @Override
public void revalidate() { public void revalidate() {
super.revalidate();
// create offscreen graphics // create offscreen graphics
try { try {
offscreen = new Image(displayContainer.width, displayContainer.height); offscreen = new Image(displayContainer.width, displayContainer.height);
@@ -1445,10 +1447,6 @@ public class Game extends ComplexOpsuState {
@Override @Override
public void enter() { public void enter() {
super.enter();
displayContainer.drawCursor = false;
overlays.clear(); overlays.clear();
if (Options.isEnableSB()) { if (Options.isEnableSB()) {
overlays.add(optionsOverlay); overlays.add(optionsOverlay);
@@ -1458,6 +1456,10 @@ public class Game extends ComplexOpsuState {
optionsOverlay.revalidate(); optionsOverlay.revalidate();
} }
super.enter();
displayContainer.drawCursor = false;
isInGame = true; isInGame = true;
if (!skippedToCheckpoint) { if (!skippedToCheckpoint) {
UI.enter(); UI.enter();

12
src/yugecin/opsudance/sbv2/MoveStoryboard.java
View File

@@ -69,6 +69,8 @@ public class MoveStoryboard extends OverlayOpsuState{
@Override @Override
public void revalidate() { public void revalidate() {
super.revalidate();
btnAddLinear = new SimpleButton(displayContainer.width - 205, 50, 200, 25, Fonts.SMALL, "add linear", Colors.BLUE_BUTTON, Colors.WHITE_FADE, Colors.WHITE_FADE, Colors.ORANGE_BUTTON); btnAddLinear = new SimpleButton(displayContainer.width - 205, 50, 200, 25, Fonts.SMALL, "add linear", Colors.BLUE_BUTTON, Colors.WHITE_FADE, Colors.WHITE_FADE, Colors.ORANGE_BUTTON);
btnAddQuadratic = new SimpleButton(displayContainer.width - 205, 80, 200, 25, Fonts.SMALL, "add quadratic", Colors.BLUE_BUTTON, Colors.WHITE_FADE, Colors.WHITE_FADE, Colors.ORANGE_BUTTON); btnAddQuadratic = new SimpleButton(displayContainer.width - 205, 80, 200, 25, Fonts.SMALL, "add quadratic", Colors.BLUE_BUTTON, Colors.WHITE_FADE, Colors.WHITE_FADE, Colors.ORANGE_BUTTON);
btnAddCubic = new SimpleButton(displayContainer.width - 205, 110, 200, 25, Fonts.SMALL, "add cubic", Colors.BLUE_BUTTON, Colors.WHITE_FADE, Colors.WHITE_FADE, Colors.ORANGE_BUTTON); btnAddCubic = new SimpleButton(displayContainer.width - 205, 110, 200, 25, Fonts.SMALL, "add cubic", Colors.BLUE_BUTTON, Colors.WHITE_FADE, Colors.WHITE_FADE, Colors.ORANGE_BUTTON);
@@ -94,16 +96,6 @@ public class MoveStoryboard extends OverlayOpsuState{
return moves[objectIndex].getPointAt(t); return moves[objectIndex].getPointAt(t);
} }
@Override
public void hide() {
}
@Override
public void show() {
}
@Override @Override
protected void onPreRenderUpdate() { protected void onPreRenderUpdate() {
int x = displayContainer.mouseX; int x = displayContainer.mouseX;