From 6145c7004e2a6da0958be3068fc193f5dda7423e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Mon, 4 Jan 2016 23:16:44 +0100 Subject: PathBuilder: factorise getPaths(...) out of canExit() --- core/src/ch/asynk/rustanddust/engine/PathBuilder.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/core/src/ch/asynk/rustanddust/engine/PathBuilder.java b/core/src/ch/asynk/rustanddust/engine/PathBuilder.java index 03b194d..524e353 100644 --- a/core/src/ch/asynk/rustanddust/engine/PathBuilder.java +++ b/core/src/ch/asynk/rustanddust/engine/PathBuilder.java @@ -259,17 +259,11 @@ public class PathBuilder implements Disposable public boolean canExit(Orientation o) { - List ps; - if (ctrlTiles.size() == 0) - ps = paths; - else - ps = filteredPaths; - int mvt = pawn.getMovementPoints(); int cost = to.exitCost(); int rBonus = (to.road(o) ? pawn.getRoadMarchBonus() : 0); - for (Path p : ps) { + for (Path p : getPaths()) { if (pathCanExit(p, mvt, cost, rBonus)) return true; } @@ -284,6 +278,13 @@ public class PathBuilder implements Disposable return false; } + private List getPaths() + { + if (ctrlTiles.size() == 0) + return paths; + return filteredPaths; + } + public Path getPath(int i) { if (ctrlTiles.size() == 0) -- cgit v1.1-2-g2b99