Erwan

- support for tinyCrops see http://wololo.net/forum/viewtopic.php?f=15&t=2197
- card images can now be named after the card's name (ex: sets/10E/Ancestor's Chosen.jpg , or sets/10E/10E.zip:Ancestor's Chosen.jpg)
- yet another attempt at fixing tokens in the shop

projects/mtg/include/CardGui.h

@@ -32,6 +32,7 @@ struct CardGui : public PlayGuiObject {
   void renderCountersBig(const Pos& pos);
   virtual void Update(float dt);
   static void alternateRender(MTGCard * card, const Pos& pos);
+  static void tinyCropRender(MTGCard * card, const Pos& pos, JQuad * quad);
   static JQuad * alternateThumbQuad(MTGCard * card);
   virtual ostream& toString(ostream&) const;
 };

projects/mtg/include/MTGDeck.h

@@ -53,6 +53,15 @@ public:
 
 class MTGSets{
 public:
+
+  //These values have to be < 0
+  // A setID with a value >=0 will be looked into the sets table,
+  // Negative values will be compared to these enums throughout the code (shop, filters...)
+  enum {
+    INTERNAL_SET = -1,
+    ALL_SETS = -2,
+  };
+
   friend class MTGSetInfo;
   MTGSets();
   ~MTGSets();

projects/mtg/include/WFilter.h

@@ -85,9 +85,9 @@ public:
 //Filter terminals:
 class WCFilterSet: public WCardFilter{
 public:
-  WCFilterSet(int _setid=-1) {setid=_setid;};
+  WCFilterSet(int _setid=MTGSets::ALL_SETS) {setid=_setid;};
   WCFilterSet(string arg);
-  bool isMatch(MTGCard *c) {return (setid==-1 || c->setId == setid);};
+  bool isMatch(MTGCard *c) {return (setid==MTGSets::ALL_SETS || c->setId == setid);};
   string getCode();
   float filterFee() {return 0.2f;};
 protected: