diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 565bda926..317f81a49 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -4846,7 +4846,7 @@ public: string after; bool aNext; APhaseAlter(GameObserver* observer, int _id, MTGCardInstance * card,Targetable * targetPlayer, bool _adding,string _phaseToAlter,string targeting, bool _aNext,string _after = "") : - TriggeredAbility(observer, _id, card),targetPlayerWho(targetPlayer),adding(_adding),phaseToAlter(_phaseToAlter),targetingString(targeting),aNext(_aNext),after(_after) + TriggeredAbility(observer, _id, card),targetPlayerWho(targetPlayer),adding(_adding),phaseToAlter(_phaseToAlter),targetingString(targeting),after(_after),aNext(_aNext) { applied = false; who = NULL; @@ -5396,8 +5396,8 @@ class AASetTypeChosen: public InstantAbility { public: int type; - string menutext; string abilityToAlter; + string menutext; MTGAbility * abilityAltered; AASetTypeChosen(GameObserver* observer, int id, MTGCardInstance * source, MTGCardInstance * target, int _type = 0,string menu = "error" ,string toAdd = ""); int resolve(); diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp index 7464fb292..31ca54591 100644 --- a/projects/mtg/src/AllAbilities.cpp +++ b/projects/mtg/src/AllAbilities.cpp @@ -330,7 +330,8 @@ ActivatedAbility(observer, _id, _source, _cost, 0) int AALibraryBottom::resolve() { MTGCardInstance * _target = (MTGCardInstance *) target; - if (_target = _target->owner->game->putInLibrary(_target)) + _target = _target->owner->game->putInLibrary(_target); + if (_target) { MTGLibrary * library = _target->owner->game->library; vectoroldOrder = library->cards;