summaryrefslogtreecommitdiffstats
path: root/core/src
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-02-23 18:40:52 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2016-02-23 18:40:52 +0100
commit83b4c581ada9b67c0a878659581295377f29094c (patch)
tree31fbc4eb5359dc69ab20155566f0847623356a50 /core/src
parent8a82cc838397a9b1d57a541a9a34a30b3a8ba54a (diff)
downloadRustAndDust-83b4c581ada9b67c0a878659581295377f29094c.tar.gz
RustAndDust-83b4c581ada9b67c0a878659581295377f29094c.zip
Menu: void postAnswer(boolean ok) -> MenuType postAnswer(boolean ok)
Diffstat (limited to 'core/src')
-rw-r--r--core/src/ch/asynk/rustanddust/menu/MainMenu.java2
-rw-r--r--core/src/ch/asynk/rustanddust/menu/MenuCtrl.java2
-rw-r--r--core/src/ch/asynk/rustanddust/menu/NewGameMenu.java2
-rw-r--r--core/src/ch/asynk/rustanddust/menu/OptionsMenu.java2
-rw-r--r--core/src/ch/asynk/rustanddust/menu/PlayMenu.java3
-rw-r--r--core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java2
6 files changed, 7 insertions, 6 deletions
diff --git a/core/src/ch/asynk/rustanddust/menu/MainMenu.java b/core/src/ch/asynk/rustanddust/menu/MainMenu.java
index 6d7016ad..b02a1e48 100644
--- a/core/src/ch/asynk/rustanddust/menu/MainMenu.java
+++ b/core/src/ch/asynk/rustanddust/menu/MainMenu.java
@@ -85,7 +85,7 @@ public class MainMenu extends Patch implements MenuCtrl.Panel
}
@Override
- public void postAnswer(boolean ok) { }
+ public MenuCtrl.MenuType postAnswer(boolean ok) { return MenuCtrl.MenuType.NONE; }
@Override
public String getAsk() { return null; }
diff --git a/core/src/ch/asynk/rustanddust/menu/MenuCtrl.java b/core/src/ch/asynk/rustanddust/menu/MenuCtrl.java
index b793d9a6..40a75c26 100644
--- a/core/src/ch/asynk/rustanddust/menu/MenuCtrl.java
+++ b/core/src/ch/asynk/rustanddust/menu/MenuCtrl.java
@@ -33,7 +33,7 @@ public class MenuCtrl implements Disposable, Drawable
public void computePosition();
public MenuType touch(float x, float y);
public String getAsk();
- public void postAnswer(boolean ok);
+ public MenuType postAnswer(boolean ok);
public boolean drag(float x, float y, int dx, int dy);
}
diff --git a/core/src/ch/asynk/rustanddust/menu/NewGameMenu.java b/core/src/ch/asynk/rustanddust/menu/NewGameMenu.java
index 4a4f3c7b..b19dd8bf 100644
--- a/core/src/ch/asynk/rustanddust/menu/NewGameMenu.java
+++ b/core/src/ch/asynk/rustanddust/menu/NewGameMenu.java
@@ -72,7 +72,7 @@ public class NewGameMenu extends Patch implements MenuCtrl.Panel
}
@Override
- public void postAnswer(boolean ok) { }
+ public MenuCtrl.MenuType postAnswer(boolean ok) { return MenuCtrl.MenuType.NONE; }
@Override
public String getAsk()
diff --git a/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java
index c1b56037..b0250498 100644
--- a/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java
+++ b/core/src/ch/asynk/rustanddust/menu/OptionsMenu.java
@@ -149,7 +149,7 @@ public class OptionsMenu extends Patch implements MenuCtrl.Panel
}
@Override
- public void postAnswer(boolean ok) { }
+ public MenuCtrl.MenuType postAnswer(boolean ok) { return MenuCtrl.MenuType.NONE; }
@Override
public String getAsk() { return null; }
diff --git a/core/src/ch/asynk/rustanddust/menu/PlayMenu.java b/core/src/ch/asynk/rustanddust/menu/PlayMenu.java
index cad12dd6..dbc6f549 100644
--- a/core/src/ch/asynk/rustanddust/menu/PlayMenu.java
+++ b/core/src/ch/asynk/rustanddust/menu/PlayMenu.java
@@ -44,12 +44,13 @@ public class PlayMenu extends Patch implements MenuCtrl.Panel
}
@Override
- public void postAnswer(boolean ok)
+ public MenuCtrl.MenuType postAnswer(boolean ok)
{
if (ok) {
game.db.deleteGame(GameRecord.remove(getList().getIdx()));
getList().unselect();
}
+ return MenuCtrl.MenuType.NONE;
}
@Override
diff --git a/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java b/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java
index 02b65c3f..d1c24a50 100644
--- a/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java
+++ b/core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java
@@ -28,7 +28,7 @@ public class TutorialsMenu extends Patch implements MenuCtrl.Panel
}
@Override
- public void postAnswer(boolean ok) { }
+ public MenuCtrl.MenuType postAnswer(boolean ok) { return MenuCtrl.MenuType.NONE; }
@Override
public String getAsk() { return null; }