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

disable chaning to polymover when changing from storyboard (close #102)

Browse Source
This commit is contained in:
yugecin
2016-12-12 19:48:03 +01:00
parent 5e8d218000
commit c88035a66c
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/itdelatrisu/opsu/Options.java
View File

@@ -18,11 +18,13 @@
package itdelatrisu.opsu; package itdelatrisu.opsu;
import awlex.ospu.polymover.factory.PolyMoverFactory;
import itdelatrisu.opsu.audio.MusicController; import itdelatrisu.opsu.audio.MusicController;
import itdelatrisu.opsu.beatmap.Beatmap; import itdelatrisu.opsu.beatmap.Beatmap;
import itdelatrisu.opsu.beatmap.TimingPoint; import itdelatrisu.opsu.beatmap.TimingPoint;
import itdelatrisu.opsu.skins.Skin; import itdelatrisu.opsu.skins.Skin;
import itdelatrisu.opsu.skins.SkinLoader; import itdelatrisu.opsu.skins.SkinLoader;
import itdelatrisu.opsu.states.Game;
import itdelatrisu.opsu.ui.Fonts; import itdelatrisu.opsu.ui.Fonts;
import itdelatrisu.opsu.ui.UI; import itdelatrisu.opsu.ui.UI;
@@ -614,6 +616,11 @@ public class Options {
@Override @Override
public void clickListItem(int index) { public void clickListItem(int index) {
if (Game.isInGame && Dancer.moverFactories[index] instanceof PolyMoverFactory) {
// TODO remove this when #79 is fixed
UI.sendBarNotification("This mover is disabled in the storyboard right now");
return;
}
Dancer.instance.setMoverFactoryIndex(index); Dancer.instance.setMoverFactoryIndex(index);
} }

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

@@ -77,6 +77,7 @@ import yugecin.opsudance.ui.SBOverlay;
* "Game" state. * "Game" state.
*/ */
public class Game extends BasicGameState { public class Game extends BasicGameState {
public static boolean isInGame; // TODO delete this when #79 is fixed
/** Game restart states. */ /** Game restart states. */
public enum Restart { public enum Restart {
/** No restart. */ /** No restart. */
@@ -1351,6 +1352,7 @@ public class Game extends BasicGameState {
@Override @Override
public void enter(GameContainer container, StateBasedGame game) public void enter(GameContainer container, StateBasedGame game)
throws SlickException { throws SlickException {
isInGame = true;
if (!skippedToCheckpoint) { if (!skippedToCheckpoint) {
UI.enter(); UI.enter();
} }
@@ -1569,6 +1571,7 @@ public class Game extends BasicGameState {
@Override @Override
public void leave(GameContainer container, StateBasedGame game) public void leave(GameContainer container, StateBasedGame game)
throws SlickException { throws SlickException {
isInGame = false;
// container.setMouseGrabbed(false); // container.setMouseGrabbed(false);
skippedToCheckpoint = false; skippedToCheckpoint = false;