J :

* Fix issue 357, where the hand loses focus when the opponent declares
  attackers while the hand is open.
* Harmonize the code for CardSelector.cpp to the coding style.

projects/mtg/include/CardSelector.h

@@ -48,6 +48,7 @@ class ObjectSelector : public GuiLayer
  LimitorFunctor<T>* limitor;
  Pos bigpos;
  map<const SelectorZone, SelectorMemory> lasts;
+ stack< pair<LimitorFunctor<T>*, SelectorZone> > limitorStack;
  stack<SelectorMemory> memoryStack;
 
  T* fetchMemory(SelectorMemory&);
@@ -60,10 +61,13 @@ class ObjectSelector : public GuiLayer
  bool CheckUserInput(JButton key);
  void Update(float dt);
  void Render();
- void Limit(LimitorFunctor<T>* limitor, SelectorZone);
  void Push();
  void Pop();
 
+ void Limit(LimitorFunctor<T>* limitor, SelectorZone);
+ void PushLimitor();
+ void PopLimitor();
+
  typedef T Target;
 };