From 4998b3731defd0cd74b8981c5a4823cba9de56c7 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Sun, 30 Oct 2011 13:48:26 +0000 Subject: [PATCH] Fixed some issues with replay. --- .../com/gempukku/lotro/game/state/GameState.java | 16 +++++++++++----- .../gemp-lotr-web/src/main/webapp/js/gameUi.js | 3 ++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java index 621b26966..dcab43e6b 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java @@ -277,14 +277,20 @@ public class GameState { } public void removeFromSkirmish(PhysicalCard card) { + removeFromSkirmish(card, true); + } + + private void removeFromSkirmish(PhysicalCard card, boolean notify) { if (_skirmish.getFellowshipCharacter() == card) { _skirmish.setFellowshipCharacter(null); - for (GameStateListener listener : getAllGameStateListeners()) - listener.removeFromSkirmish(card); + if (notify) + for (GameStateListener listener : getAllGameStateListeners()) + listener.removeFromSkirmish(card); } if (_skirmish.getShadowCharacters().remove(card)) { - for (GameStateListener listener : getAllGameStateListeners()) - listener.removeFromSkirmish(card); + if (notify) + for (GameStateListener listener : getAllGameStateListeners()) + listener.removeFromSkirmish(card); } } @@ -321,7 +327,7 @@ public class GameState { } if (_skirmish != null) - removeFromSkirmish(card); + removeFromSkirmish(card, false); removeAllTokens(card); } 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 040454d97..916d868cd 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 @@ -667,7 +667,8 @@ var GempLotrGameUI = Class.extend({ var decision = decisions[0]; this.animations.processDecision(decision, animate); } else { - this.animations.updateGameState(animate); + if (!this.replayMode) + this.animations.updateGameState(animate); } },