From 67495a042e2df886eadb242ac5a3601e1ce12bd8 Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Thu, 19 Feb 2015 01:09:49 +0100 Subject: Map: engagement is ok for solo and AI but not for network --- core/src/ch/asynk/tankontank/game/Map.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'core/src/ch/asynk') diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java index 7d4bf949..7d22dd81 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); } -- cgit v1.2.3