Merge branch 'master' into minmax

2014-01-24 23:49:30 +01:00
parent 746a486e7a 30d92eb68c
commit 541698f98e
100 changed files with 5124 additions and 1688 deletions
@@ -795,6 +795,7 @@ void GameObserver::gameStateBasedEffects()
                    c->wasDealtDamage = false;
                c->damageToController = false;
                c->damageToOpponent = false;
+                c->damageToCreature = false;
                c->isAttacking = NULL;
            }
            for (int t = 0; t < nbcards; t++)