X11 build fixups

- fixed -Werror=misleading-indentation warning
- fixed -Werror=nonnull-compare warning on xll and QT builds
- PNG_LIBPNG_VER backward compatibily changes
- giflib backward compatibily changes
- resolved some undefs for X11 build
- silenced some small compile warnings in JGE Makefile
- added -DTIXML_USE_STL to remaining build types (PSP had it added)
- fixed x11 Boost incompatibility issue part of #548
- reworked PrecompiledHeader.h platforms used
This commit is contained in:
Rolzad73
2017-01-28 04:19:46 -05:00
parent e3dc78b28e
commit 85f66a8fec
19 changed files with 174 additions and 101 deletions

View File

@@ -5371,7 +5371,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;
@@ -5543,7 +5543,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)