# HG changeset patch
# User Jaroslav Tulach <jaroslav.tulach@apidesign.org>
# Date 1261598518 -3600
# Node ID 75f006899f4eb6355774f13f8984c824c378f84c
# Parent  3de0568f7ee8678c2b93fcd74934a180a7fa55a1
Adjusting the computation of a status for a game. Preferrably checking the status, only then the names.

diff -r 3de0568f7ee8 -r 75f006899f4e freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.fmt
--- a/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.fmt	Wed Dec 23 20:45:19 2009 +0100
+++ b/freemarkerdor/src/main/resources/cz/xelfi/quoridor/freemarkerdor/UI/game.fmt	Wed Dec 23 21:01:58 2009 +0100
@@ -80,10 +80,17 @@
 
       <#macro status who>
           ${who?string}
-          <#if who = doc.game.@currentPlayer>
-              <#if doc.game.id.@status = "whiteWon" || doc.game.id.@status = "blackWon" >
+          <#if who = doc.game.id.@white>
+              <#if doc.game.id.@status = "whiteWon" >
                 - ${bundle.HAS_WON}
-              <#else>
+              <#elseif doc.game.id.@status = "whiteMove" && who = doc.game.@currentPlayer>
+                - ${bundle.TO_MOVE}
+              </#if>
+          </#if>
+          <#if who = doc.game.id.@black>
+              <#if doc.game.id.@status = "blackWon" >
+                - ${bundle.HAS_WON}
+              <#elseif doc.game.id.@status = "blackMove" && who = doc.game.@currentPlayer>
                 - ${bundle.TO_MOVE}
               </#if>
           </#if>