diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-02-19 01:09:49 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-02-19 01:09:49 +0100 |
| commit | 67495a042e2df886eadb242ac5a3601e1ce12bd8 (patch) | |
| tree | 511ba628f0d47948ec9d16ea50da628a00303c01 /core/src/ch/asynk/tankontank/game | |
| parent | a4713fea06f3220a85fea030a469cd6fa324fb02 (diff) | |
| download | RustAndDust-67495a042e2df886eadb242ac5a3601e1ce12bd8.zip RustAndDust-67495a042e2df886eadb242ac5a3601e1ce12bd8.tar.gz | |
Map: engagement is ok for solo and AI but not for network
Diffstat (limited to 'core/src/ch/asynk/tankontank/game')
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/Map.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java index 7d4bf94..7d22dd8 100644 --- a/core/src/ch/asynk/tankontank/game/Map.java +++ b/core/src/ch/asynk/tankontank/game/Map.java @@ -342,6 +342,8 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS r = promoteUnit(cmd.unit, cmd.player); break; case ENGAGE: + // FIXME having the dice roll here does not fit networking game + resolveEngagement(cmd.engagement); r = doEngagement(cmd.engagement); break; default: @@ -438,9 +440,6 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS Command cmd = Command.get(ctrl.player); cmd.setEngage(unit, target); - - // FIXME resolve the engagement here does not work for the AI - resolveEngagement(cmd.engagement); return (process(cmd) == 1); } |