summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-11-05 09:45:20 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-11-05 09:45:20 +0100
commitfd389225748a39ec948c3d1908dce99606a2b84f (patch)
tree1e77c3426e35c68ed5860e1f4a7be80a27a598c6
parent9c3e23977e80a17153a0c908ba258a7ec0624741 (diff)
downloadRustAndDust-fd389225748a39ec948c3d1908dce99606a2b84f.zip
RustAndDust-fd389225748a39ec948c3d1908dce99606a2b84f.tar.gz
OptionsMenu: remove game mode option
-rw-r--r--core/src/ch/asynk/rustanddust/menu/OptionsMenu.java31
1 files changed, 0 insertions, 31 deletions
diff --git a/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java
index 9a7c675..f569b8c 100644
--- a/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java
+++ b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java
@@ -41,8 +41,6 @@ public class OptionsMenu extends Patch
private Label fxVolumeValue;
private Label graphics;
private Label graphicsValue;
- private Label gameMode;
- private Label gameModeValue;
private Label [] checkLabels;
private boolean [] checkValues;
private OkCancel okCancel;
@@ -65,10 +63,6 @@ public class OptionsMenu extends Patch
this.graphics.write("Graphics");
this.graphicsValue = new Label(font);
this.graphicsValue.write(game.config.graphics.s);
- this.gameMode = new Label(font);
- this.gameMode.write("Game mode");
- this.gameModeValue = new Label(font);
- this.gameModeValue.write(game.config.gameMode.s);
this.checkValues = new boolean[checkStrings.length];
this.checkLabels = new Label[checkStrings.length];
for (int i = 0; i < checkLabels.length; i++) {
@@ -104,12 +98,6 @@ public class OptionsMenu extends Patch
game.config.canCancel = checkValues[2];
game.config.mustValidate = checkValues[1];
game.config.debug = checkValues[0];
- if (!game.config.gameModeImplemented()) {
- this.visible = false;
- okCancel.show(String.format("'%s' Game Mode not implemented yet.", game.config.gameMode.s));
- okCancel.noCancel();
- return false;
- }
return true;
}
@@ -133,22 +121,12 @@ public class OptionsMenu extends Patch
graphicsValue.setPosition(fx, fy);
}
- private void cycleGameMode()
- {
- game.config.gameMode = game.config.gameMode.next();
- float fx = gameModeValue.getX();
- float fy = gameModeValue.getY();
- gameModeValue.write(game.config.gameMode.s);
- gameModeValue.setPosition(fx, fy);
- }
-
public void setPosition()
{
float h = (title.getHeight() + TITLE_PADDING + ((checkLabels.length - 1) * VSPACING) + (2 * PADDING));
for (int i = 0; i < checkLabels.length; i++)
h += checkLabels[i].getHeight();
h += (graphics.getHeight() + VSPACING);
- h += (gameMode.getHeight() + VSPACING);
h += (fxVolume.getHeight() + VSPACING);
float w = title.getWidth();
@@ -172,9 +150,6 @@ public class OptionsMenu extends Patch
graphics.setPosition(x, y);
graphicsValue.setPosition((x + graphics.getWidth() + 10), y);
y += dy;
- gameMode.setPosition(x, y);
- gameModeValue.setPosition((x + gameMode.getWidth() + 10), y);
- y += dy;
fxVolume.setPosition(x, y);
fxVolumeValue.setPosition((x + fxVolume.getWidth() + 10), y);
y += dy;
@@ -203,8 +178,6 @@ public class OptionsMenu extends Patch
cycleFxVolume();
} else if (graphics.hit(x, y) || graphicsValue.hit(x, y)) {
cycleGraphics();
- } else if (gameMode.hit(x, y) || gameModeValue.hit(x, y)) {
- cycleGameMode();
} else {
for (int i = 0; i < checkLabels.length; i++) {
if (checkLabels[i].hit(x, y))
@@ -226,8 +199,6 @@ public class OptionsMenu extends Patch
fxVolumeValue.dispose();
graphics.dispose();
graphicsValue.dispose();
- gameMode.dispose();
- gameModeValue.dispose();
for (int i = 0; i < checkLabels.length; i++)
checkLabels[i].dispose();
}
@@ -245,8 +216,6 @@ public class OptionsMenu extends Patch
fxVolumeValue.draw(batch);
graphics.draw(batch);
graphicsValue.draw(batch);
- gameMode.draw(batch);
- gameModeValue.draw(batch);
for (int i = 0; i < checkLabels.length; i++) {
Label l = checkLabels[i];
l.draw(batch);