From b0ab33be82abee27994400c2183429e524330767 Mon Sep 17 00:00:00 2001 From: "omegablast2002@yahoo.com" Date: Tue, 1 May 2012 15:52:16 +0000 Subject: [PATCH] fix for flip cards changing name after a transforms ability... I remember adding that patchwork fix a long time ago, not sure if whatever it fixed was even really an issue or just a overprotective line i added. either way if it was an issue, addType is what should re-add the name, not transformer ability. --- projects/mtg/src/AllAbilities.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp index 650bb069d..76dac9cba 100644 --- a/projects/mtg/src/AllAbilities.cpp +++ b/projects/mtg/src/AllAbilities.cpp @@ -1641,6 +1641,7 @@ int AAFlip::resolve() if(!fcard) return 0; MTGCardInstance * myFlip = NEW MTGCardInstance(fcard, _target->controller()->game); _target->name = myFlip->name; + _target->setName(myFlip->name); _target->colors = myFlip->colors; _target->types = myFlip->types; _target->text = myFlip->text; @@ -3849,9 +3850,13 @@ int ATransformer::destroy() _target->addType(*it); } } - //in the case that we removed or added types to a card, so that it retains its original name when the effect is removed. - if(_target->model->data->name.size())//tokens don't have a model name. - _target->setName(_target->model->data->name.c_str()); + ////in the case that we removed or added types to a card, so that it retains its original name when the effect is removed. + //if(_target->model->data->name.size())//tokens don't have a model name. + // _target->setName(_target->model->data->name.c_str()); + + //edit: this ability shouldn't have to reset the name on a card becuase removing a subtype changes the name of a land. + //that should be handled in addType...not here. + //im sure commenting this out will reintroduce a bug somewhere but it needs to be handled correctly. furthermore, why does adding and removing a type touch the name of a card? } return 1; }