move reducedCost and increasedCost out of cardprimitives and into MTGCardInstance

2011-04-20 12:14:27 +00:00
parent d892db60d9
commit ba7640079c
5 changed files with 20 additions and 16 deletions
@@ -18,8 +18,6 @@ protected:
    ManaCost manaCost;

 public:
-    ManaCost reducedCost;
-    ManaCost increasedCost;
    string text;
    string name;
    int init();
@@ -74,8 +72,6 @@ public:

    void setManaCost(string value);
    ManaCost * getManaCost();
-    ManaCost * getReducedManaCost();
-    ManaCost * getIncreasedManaCost();
    bool isCreature();
    bool isLand();
    bool isSpell();
@@ -94,6 +94,10 @@ class MTGCardInstance: public CardPrimitive, public MTGCard, public Damageable {
  MTGCardInstance * next;
  int doDamageTest;
  int summoningSickness;
+  ManaCost reducedCost;
+  ManaCost increasedCost;
+  ManaCost * getReducedManaCost();
+  ManaCost * getIncreasedManaCost();

  bool matchesCastFilter(int castMethod);