fixed a bug where cards with vanishing (new vanishing) were given "vanishing as a menu item during combat.

projects/mtg/include/AllAbilities.h

@@ -4001,8 +4001,8 @@ public:
     ~APreventDamageTypesUEOT();
 };
 
-//Upkeep Cost
-class AVanishing: public ActivatedAbility
+//vanishing
+class AVanishing: public MTGAbility
 {
 public:
     int timeLeft;

projects/mtg/src/ActionStack.cpp

@@ -556,7 +556,6 @@ int ActionStack::addDamage(MTGCardInstance * _source, Damageable * _target, int
     addAction(damage);
     _source->thatmuch = _damage;
     _target->thatmuch = _damage;
-    //_target->lifeLostThisTurn += _damage;
     return 1;
 }
 

projects/mtg/src/AllAbilities.cpp

@@ -2792,8 +2792,10 @@ APreventDamageTypesUEOT::~APreventDamageTypesUEOT()
 
 //AVanishing creature also fading
 AVanishing::AVanishing(int _id, MTGCardInstance * card, ManaCost * _cost, int _tap, int restrictions, int amount, string counterName) :
-ActivatedAbility(_id, card, _cost, restrictions, _tap),amount(amount),counterName(counterName)
+MTGAbility(_id, source, target),amount(amount),counterName(counterName)
 {
+    target = card;
+    source = card;
     next = 0;
     for(int i = 0;i< amount;i++)
         source->counters->addCounter(counterName.c_str(),0,0);
@@ -2835,7 +2837,7 @@ void AVanishing::Update(float dt)
             }
         }
     }
-    ActivatedAbility::Update(dt);
+    MTGAbility::Update(dt);
 }
 
 int AVanishing::resolve()