ERwan

-fix issue 297
- also removed the "untapBlockers" system. The idea was nice but incorrectly implemented, and only 2 cards were using it so far.

projects/mtg/src/GameObserver.cpp

@@ -435,7 +435,7 @@ void GameObserver::cardClick (MTGCardInstance * card, Targetable * object){
       mLayers->actionLayer()->setMenuObject(object);
     }
   }else if (card->isTapped() && card->controller() == currentPlayer){
-    ConstraintResolver::untap(this, card);
+    untap(card);
   }
 
 
@@ -443,6 +443,17 @@ void GameObserver::cardClick (MTGCardInstance * card, Targetable * object){
 }
 
 
+int GameObserver::untap(MTGCardInstance * card) {
+  if (!card->isUntapping()){
+    return 0;
+  }
+  if (card->has(Constants::DOESNOTUNTAP)) return 0;
+
+  card->attemptUntap();
+  return 1;
+}
+
+
 TargetChooser * GameObserver::getCurrentTargetChooser(){
   TargetChooser * _tc = mLayers->actionLayer()->getCurrentTargetChooser();
   if (_tc) return _tc;