Erwan

-Fixed a bug with */* creatures that don't die when they come into play as 0/0
-Fixed a bug with hymn of rebirth introduced in rev 245

projects/mtg/src/GameObserver.cpp

@@ -225,6 +225,9 @@ void GameObserver::Update(float dt){
 //applies damage to creatures after updates
 //Players life test
 void GameObserver::stateEffects(){
+  if (mLayers->stackLayer()->count(0,NOT_RESOLVED) != 0) return;
+  if (mLayers->actionLayer()->menuObject) return;
+  if (targetChooser || mLayers->actionLayer()->isWaitingForAnswer()) return;
   for (int i =0; i < 2; i++){
     MTGGameZone * zone = players[i]->game->inPlay;
     for (int j = zone->nb_cards-1 ; j>=0; j--){

projects/mtg/src/MTGCardInstance.cpp

@@ -84,7 +84,7 @@ void MTGCardInstance::initMTGCI(){
   model=NULL;
   isToken = false;
   lifeOrig = 0;
-  doDamageTest = 0;
+  doDamageTest = 1;
   belongs_to=NULL;
   tapped = 0;
   blockers = NEW Blockers();
@@ -125,6 +125,7 @@ int MTGCardInstance::isInPlay(){
 int MTGCardInstance::afterDamage(){
   if (!doDamageTest) return 0;
   doDamageTest = 0;
+  if (!isACreature()) return 0;
   if (life <=0 && isInPlay()){
     GameObserver * game = GameObserver::GetInstance();
     game->mLayers->stackLayer()->addPutInGraveyard(this);