Merge pull request #911 from Rolzad73/x11_fixes

X11 build fixes
This commit is contained in:
Rolzad73
2017-01-28 13:17:50 -05:00
committed by GitHub
20 changed files with 180 additions and 103 deletions

View File

@@ -5388,7 +5388,7 @@ int ActivatedAbility::isReactingToClick(MTGCardInstance * card, ManaCost * mana)
case OPPONENT_TURN_ONLY:
if (player == game->currentPlayer)
return 0;
break;
break;
case AS_SORCERY:
if (player != game->currentPlayer)
return 0;
@@ -5560,7 +5560,7 @@ int ActivatedAbility::activateAbility()
ExtraCost * tapper = dynamic_cast<TapCost*>(cost->extraCosts->costs[i]);
if(tapper)
needsTapping = 1;
wasTappedForMana = true;
wasTappedForMana = true;
}
}
else if(amp||femp)