summaryrefslogtreecommitdiffstats
path: root/core/src
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-03-24 16:34:09 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2016-03-24 16:34:09 +0100
commite7e81d1cc854e81e648fa9129dbd4dd5f58c3c32 (patch)
tree9abf96c91f3cf03a5d845cc8c0bc74e080455fa8 /core/src
parent832a55a88268ce5bc40c7b2b52cd118580024397 (diff)
downloadRustAndDust-e7e81d1cc854e81e648fa9129dbd4dd5f58c3c32.zip
RustAndDust-e7e81d1cc854e81e648fa9129dbd4dd5f58c3c32.tar.gz
Map4Orders: code reorder
Diffstat (limited to 'core/src')
-rw-r--r--core/src/ch/asynk/rustanddust/game/map/Map4Orders.java38
1 files changed, 19 insertions, 19 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/map/Map4Orders.java b/core/src/ch/asynk/rustanddust/game/map/Map4Orders.java
index dae4e91..f9a02ac 100644
--- a/core/src/ch/asynk/rustanddust/game/map/Map4Orders.java
+++ b/core/src/ch/asynk/rustanddust/game/map/Map4Orders.java
@@ -119,25 +119,6 @@ public abstract class Map4Orders extends Map3Animations
return order;
}
- private void initMove(Unit unit)
- {
- activableUnits.remove(unit);
- activatedUnits.add(unit);
- playMoveSound(unit);
- }
-
- private int doPromote(final Unit unit)
- {
- activatedUnits.add(unit);
- addPromoteAnimation(unit, battle.getPlayer(), new Runnable() {
- @Override
- public void run() {
- battle.getPlayer().promote(unit);
- }
- });
- return 1;
- }
-
private int process(Order order)
{
RustAndDust.debug("Order", order.toString());
@@ -205,6 +186,25 @@ public abstract class Map4Orders extends Map3Animations
return r;
}
+ private void initMove(Unit unit)
+ {
+ activableUnits.remove(unit);
+ activatedUnits.add(unit);
+ playMoveSound(unit);
+ }
+
+ private int doPromote(final Unit unit)
+ {
+ activatedUnits.add(unit);
+ addPromoteAnimation(unit, battle.getPlayer(), new Runnable() {
+ @Override
+ public void run() {
+ battle.getPlayer().promote(unit);
+ }
+ });
+ return 1;
+ }
+
private int doEngagement(Engagement e)
{
resolveEngagement(e);