From 6ea6d191d0cad59845efb41764310230786621f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 23 Mar 2016 23:02:49 +0100 Subject: Map4Orders: cmd -> order --- .../ch/asynk/rustanddust/game/map/Map4Orders.java | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/core/src/ch/asynk/rustanddust/game/map/Map4Orders.java b/core/src/ch/asynk/rustanddust/game/map/Map4Orders.java index dd133ca..823c05a 100644 --- a/core/src/ch/asynk/rustanddust/game/map/Map4Orders.java +++ b/core/src/ch/asynk/rustanddust/game/map/Map4Orders.java @@ -98,25 +98,25 @@ public abstract class Map4Orders extends Map3Animations { attack(unit, target, true); - Order cmd = Order.get(); - cmd.setEngage(unit, target); - return (process(cmd) == 1); + Order order = Order.get(); + order.setEngage(unit, target); + return (process(order) == 1); } public void promoteUnit(final Unit unit) { - Order cmd = Order.get(); - cmd.setPromote(unit); - process(cmd); + Order order = Order.get(); + order.setPromote(unit); + process(order); } // STATES ENTRY <- private Order getMoveOrder(Unit unit, Move move) { - Order cmd = Order.get(); - cmd.setMove(unit, move); - return cmd; + Order order = Order.get(); + order.setMove(unit, move); + return order; } private void initMove(Unit unit) @@ -138,30 +138,30 @@ public abstract class Map4Orders extends Map3Animations return 1; } - private int process(Order cmd) + private int process(Order order) { - RustAndDust.debug("Order", cmd.toString()); + RustAndDust.debug("Order", order.toString()); int r = 1; - switch(cmd.type) { + switch(order.type) { case MOVE: - r = process(cmd.unit, cmd.move); + r = process(order.unit, order.move); break; case PROMOTE: - r = doPromoteUnit(cmd.unit); + r = doPromoteUnit(order.unit); break; case ENGAGE: - r = doEngagement(cmd.engagement); + r = doEngagement(order.engagement); break; default: - System.err.println(String.format("process wrong Order type %s", cmd.type)); + System.err.println(String.format("process wrong Order type %s", order.type)); r = -1; break; } if (r != -1) { - orders.add(cmd); + orders.add(order); game.ctrl.orderProcessedCb(); } -- cgit v1.1-2-g2b99