diff --git a/projects/mtg/include/MTGCard.h b/projects/mtg/include/MTGCard.h index 0c24fd091..a7db8f198 100644 --- a/projects/mtg/include/MTGCard.h +++ b/projects/mtg/include/MTGCard.h @@ -1,7 +1,7 @@ #ifndef _MTGCARD_H_ #define _MTGCARD_H_ -#define MTGCARD_NAME_SIZE 30 +#define MTGCARD_NAME_SIZE 16 #define MTG_IMAGE_WIDTH 200 #define MTG_IMAGE_HEIGHT 285 @@ -9,9 +9,6 @@ #define MTG_MINIIMAGE_WIDTH 45 #define MTG_MINIIMAGE_HEIGHT 64 -#define MAX_TYPES_PER_CARD 10 - - #include #include #include diff --git a/projects/mtg/include/MTGCardInstance.h b/projects/mtg/include/MTGCardInstance.h index bfdfdd448..208b24e15 100644 --- a/projects/mtg/include/MTGCardInstance.h +++ b/projects/mtg/include/MTGCardInstance.h @@ -33,7 +33,6 @@ class MTGCardInstance: public CardPrimitive, public MTGCard, public Damageable { int lifeOrig; MTGPlayerCards * belongs_to; - MTGAbility * untapBlockerAbilities[10]; MTGCardInstance * getNextPartner(); void initMTGCI(); int setDefenser(MTGCardInstance * c); @@ -57,7 +56,6 @@ class MTGCardInstance: public CardPrimitive, public MTGCard, public Damageable { // The recommended method to test for summoning Sickness ! int hasSummoningSickness(); MTGCardInstance * changeController(Player * newcontroller); - float changedZoneRecently; Player * owner; Counters * counters; int typeAsTarget(){return TARGET_CARD;} diff --git a/projects/mtg/src/MTGCardInstance.cpp b/projects/mtg/src/MTGCardInstance.cpp index f54c2fa66..efd03a49a 100644 --- a/projects/mtg/src/MTGCardInstance.cpp +++ b/projects/mtg/src/MTGCardInstance.cpp @@ -107,7 +107,6 @@ void MTGCardInstance::initMTGCI(){ type_as_damageable = DAMAGEABLE_MTGCARDINSTANCE; banding = NULL; owner = NULL; - changedZoneRecently = 0; counters = NEW Counters(this); previousZone = NULL; previous = NULL; diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp index dc1c148ad..3a85c6576 100644 --- a/projects/mtg/src/MTGGameZones.cpp +++ b/projects/mtg/src/MTGGameZones.cpp @@ -150,7 +150,6 @@ MTGCardInstance * MTGPlayerCards::putInZone(MTGCardInstance * card, MTGGameZone MTGCardInstance * ret = copy; to->addCard(copy); - copy->changedZoneRecently = 1.f; GameObserver *g = GameObserver::GetInstance(); WEvent * e = NEW WEventZoneChange(copy, from, to); g->receiveEvent(e);