summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-12-18 11:22:40 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-12-18 11:22:40 +0100
commita63bce0fd3f343a51a06a7f41997536b1cd8f974 (patch)
tree71aba07a345aa788faaf1bb4d7517c50af00d6dc /core/src/ch/asynk
parent98440346222b9c6c2c861098b353f14de799492f (diff)
downloadRustAndDust-a63bce0fd3f343a51a06a7f41997536b1cd8f974.zip
RustAndDust-a63bce0fd3f343a51a06a7f41997536b1cd8f974.tar.gz
OptionsMenu: get rid of useless OkCancel
Diffstat (limited to 'core/src/ch/asynk')
-rw-r--r--core/src/ch/asynk/rustanddust/menu/OptionsMenu.java11
1 files changed, 0 insertions, 11 deletions
diff --git a/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java
index 4499405..45b7af8 100644
--- a/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java
+++ b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java
@@ -39,7 +39,6 @@ public class OptionsMenu extends Patch
private Label [] checkLabels;
private int fxVolumeIdx;
private boolean [] checkValues;
- private OkCancel okCancel;
protected Bg okBtn;
protected Bg cancelBtn;
@@ -48,7 +47,6 @@ public class OptionsMenu extends Patch
super(game.ninePatch);
this.game = game;
this.font = game.font;
- this.okCancel = new OkCancel(font, game.ninePatch, game.getUiRegion(game.UI_OK), game.getUiRegion(game.UI_CANCEL));
this.okBtn = new Bg(game.getUiRegion(game.UI_OK));
this.cancelBtn = new Bg(game.getUiRegion(game.UI_CANCEL));
this.title = new Label(font);
@@ -140,12 +138,6 @@ public class OptionsMenu extends Patch
@Override
public boolean hit(float x, float y)
{
- if (okCancel.hit(x, y)) {
- this.visible = true;
- okCancel.visible = false;
- return false;
- }
-
if (!visible) return false;
if (okBtn.hit(x, y)) {
@@ -172,7 +164,6 @@ public class OptionsMenu extends Patch
title.dispose();
okBtn.dispose();
cancelBtn.dispose();
- okCancel.dispose();
fxVolume.dispose();
fxVolumeValue.dispose();
for (int i = 0; i < checkLabels.length; i++)
@@ -182,8 +173,6 @@ public class OptionsMenu extends Patch
@Override
public void draw(Batch batch)
{
- okCancel.draw(batch);
-
if (!visible) return;
super.draw(batch);
title.draw(batch);