Erwan

-fix issue 70 - J, please review
2009-09-30 13:27:48 +00:00
parent 78da055dd2
commit 91986abe2d
1 changed files with 12 additions and 1 deletions
--- a/projects/mtg/src/CardSelector.cpp
+++ b/projects/mtg/src/CardSelector.cpp
@@ -216,7 +216,18 @@ void CardSelector::Limit(LimitorFunctor<Target>* limitor, SelectorZone destzone)
              active = old;
          lasts[oldowner] = SelectorMemory(oldactive);
        }
-      if (limitor && !limitor->select(active)) active = NULL;
+
+      if (limitor && !limitor->select(active))
+        {
+          active = NULL;
+          for (vector<Target*>::iterator it = cards.begin(); it != cards.end(); ++it)
+	          if (limitor->select(*it))
+	            {
+	              active = *it;
+                break;
+	            }
+        }
+
      if (active != oldactive)
        {
          { CardView* c = dynamic_cast<CardView*>(oldactive); if (c) c->zoom = 1.0; }