diff --git a/projects/mtg/include/AllAbilities.h b/projects/mtg/include/AllAbilities.h index 632e5603e..14e6b34dc 100644 --- a/projects/mtg/include/AllAbilities.h +++ b/projects/mtg/include/AllAbilities.h @@ -2794,7 +2794,7 @@ class AAbomination :public MTGAbility{ if( newPhase == MTG_PHASE_COMBATDAMAGE){ nbOpponents = 0; MTGCardInstance * opponent = source->getNextOpponent(); - while (opponent && opponent->hasColor(MTG_COLOR_GREEN) || opponent->hasColor(MTG_COLOR_WHITE)){ + while ((opponent && opponent->hasColor(MTG_COLOR_GREEN)) || opponent->hasColor(MTG_COLOR_WHITE)){ opponents[nbOpponents] = opponent; nbOpponents ++; opponent = source->getNextOpponent(opponent); diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index d519e970d..55dd8ec57 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -38,7 +38,7 @@ int AbilityFactory::putInPlayFromZone(MTGCardInstance * card, MTGGameZone * zone Trigger * AbilityFactory::parseTrigger(string magicText){ - int found = magicText.find("@"); + size_t found = magicText.find("@"); if (found == string::npos) return NULL; //Next Time... @@ -1707,7 +1707,7 @@ int ListMaintainerAbility::destroy(){ MTGAbilityBasicFeatures::MTGAbilityBasicFeatures(){ game = GameObserver::GetInstance(); } -MTGAbilityBasicFeatures::MTGAbilityBasicFeatures(MTGCardInstance * _source, Damageable * _target):source(_source),target(_target){ +MTGAbilityBasicFeatures::MTGAbilityBasicFeatures(MTGCardInstance * _source, Damageable * _target):target(_target),source(_source){ if (!target) target = source; game = GameObserver::GetInstance(); }