Merge pull request #778 from zethfoxster/master

getting master

projects/mtg/include/AllAbilities.h

@@ -4456,6 +4456,29 @@ public:
     const string getMenuText();
     AAMorph * clone() const;
 };
+
+class AAMeldFrom : public ActivatedAbility
+{
+public:
+    string _MeldedName;
+    AAMeldFrom(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target, string MeldedName = "");
+    int resolve();
+
+    const string getMenuText();
+    AAMeldFrom * clone() const;
+};
+/* meld*/
+class AAMeld : public ActivatedAbility
+{
+public:
+    string _MeldedName;
+    AAMeld(GameObserver* observer, int id, MTGCardInstance * card, MTGCardInstance * _target,string MeldedName = "");
+    int resolve();
+
+    const string getMenuText();
+    AAMeld * clone() const;
+};
+
 /* flip*/
 class AAFlip: public InstantAbility
 {

projects/mtg/include/ExtraCost.h

@@ -299,7 +299,8 @@ public:
 class Offering : public ExtraCost
 {
 public:
-  Offering(TargetChooser *_tc = NULL);
+    bool emerge;
+  Offering(TargetChooser *_tc = NULL, bool emerge = false);
   virtual int canPay();
   virtual int isPaymentSet();
   virtual int doPay();

projects/mtg/include/MTGCardInstance.h

@@ -89,6 +89,7 @@ public:
     bool turningOver;
     bool isMorphed;
     bool isFlipped;
+    string MeldedFrom;
     bool isPhased;
     bool isCascaded;
     int phasedTurn;