From 25497aeb4495d3611d8cfb4ac37087f0a4d409a8 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Wed, 21 Sep 2011 12:48:25 +0000
Subject: [PATCH] Ordering of non-animation and animation events to have better
 play experience.

---
 .../gemp-lotr-web/src/main/webapp/js/gameUi.js | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js
index 5db593673..d941f5b37 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js
+++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gameUi.js
@@ -467,6 +467,8 @@ var GempLotrGameUI = Class.extend({
 
     processGameEventsXml: function(element) {
         var gameEvents = element.getElementsByTagName("gameEvent");
+
+        // First the non-animation things
         for (var i = 0; i < gameEvents.length; i++) {
             var gameEvent = gameEvents[i];
             var eventType = gameEvent.getAttribute("type");
@@ -504,10 +506,21 @@ var GempLotrGameUI = Class.extend({
                 this.message(gameEvent);
             } else if (eventType == "WARNING") {
                 this.warning(gameEvent);
-            } else if (eventType == "CARD_AFFECTS_CARD") {
+            }
+        }
+
+        if (gameEvents.length > 0)
+            this.layoutUI(true);
+
+        // Then the strictly animation events
+        for (var i = 0; i < gameEvents.length; i++) {
+            var gameEvent = gameEvents[i];
+            var eventType = gameEvent.getAttribute("type");
+            if (eventType == "CARD_AFFECTS_CARD") {
                 this.cardAffectsCard(gameEvent);
             }
         }
+
         var skirmish = element.getElementsByTagName("skirmish")
         if (skirmish.length > 0) {
             this.fpStrengthDiv.text(skirmish[0].getAttribute("fpStrength"));
@@ -532,9 +545,6 @@ var GempLotrGameUI = Class.extend({
             }
         }
 
-        if (gameEvents.length > 0)
-            this.layoutUI(true);
-
         var decisions = element.getElementsByTagName("decision");
         if (decisions.length == 1) {
             var decision = decisions[0];