Jeck - Minor update to trophy room, moved metadata into cards.dat

* updated daily build
* Card spoiler now sorts by collector's number.
* Metadata looks for "[m" (for speed reasons), I've been using "[meta]" in files. No sets currently use metadata.

projects/mtg/include/MTGDeck.h

@@ -11,14 +11,10 @@
 #include <string>
 
 using std::string;
-
-
 class GameApp;
 class MTGCard;
 class CardPrimitive;
 
-#define SET_METADATA "setinfo.txt"
-
 class MTGSetInfo{
 public:
   MTGSetInfo(string _id);
@@ -36,6 +32,7 @@ public:
   string getBlock();
   int boosterCost();
   int boosterSize();
+  void processConfLine(string line);
 
   enum {
     //For memoized counts
@@ -91,7 +88,11 @@ private:
   void init();
   void initCounters();
  public:
-
+  enum {
+   READ_ANYTHING = 0,
+   READ_CARD = 1,
+   READ_METADATA = 2,
+  };
   vector<int> ids;
   map<int, MTGCard *> collection;
   map<string,CardPrimitive *>primitives;
@@ -119,8 +120,6 @@ private:
 class MTGDeck{
  protected:
   string filename;
-
-  
   int total_cards;
 
  public:

projects/mtg/include/OptionItem.h

@@ -177,6 +177,19 @@ protected:
   float mLastInput;
 };
 
+struct WCardSort{
+public:
+  virtual bool operator()(const MTGCard*l, const MTGCard*r) = 0;
+};
+
+struct WCSortCollector: public WCardSort{
+  bool operator()(const MTGCard*l, const MTGCard*r);
+};
+
+struct WCSortAlpha: public WCardSort{
+  bool operator()(const MTGCard*l, const MTGCard*r);
+};
+
 class WGuiImage: public WGuiItem{
 public:
   WGuiImage(WDataSource * wds, float _w = 0, float _h = 0, int _margin = 0);