From 91986abe2d5610f6257d7d0acf06621ed4cd0f4a Mon Sep 17 00:00:00 2001 From: "wagic.the.homebrew@gmail.com" Date: Wed, 30 Sep 2009 13:27:48 +0000 Subject: [PATCH] Erwan -fix issue 70 - J, please review --- projects/mtg/src/CardSelector.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/projects/mtg/src/CardSelector.cpp b/projects/mtg/src/CardSelector.cpp index 6caeba697..17369c6e9 100644 --- a/projects/mtg/src/CardSelector.cpp +++ b/projects/mtg/src/CardSelector.cpp @@ -216,7 +216,18 @@ void CardSelector::Limit(LimitorFunctor* 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::iterator it = cards.begin(); it != cards.end(); ++it) + if (limitor->select(*it)) + { + active = *it; + break; + } + } + if (active != oldactive) { { CardView* c = dynamic_cast(oldactive); if (c) c->zoom = 1.0; }