From 83b4c581ada9b67c0a878659581295377f29094c Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Tue, 23 Feb 2016 18:40:52 +0100 Subject: Menu: void postAnswer(boolean ok) -> MenuType postAnswer(boolean ok) --- core/src/ch/asynk/rustanddust/menu/MainMenu.java | 2 +- core/src/ch/asynk/rustanddust/menu/MenuCtrl.java | 2 +- core/src/ch/asynk/rustanddust/menu/NewGameMenu.java | 2 +- core/src/ch/asynk/rustanddust/menu/OptionsMenu.java | 2 +- core/src/ch/asynk/rustanddust/menu/PlayMenu.java | 3 ++- core/src/ch/asynk/rustanddust/menu/TutorialsMenu.java | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) (limited to 'core/src/ch') 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; } -- cgit v1.2.3