From 4aa5dec51a72797ba18306e769643dce368b1ef5 Mon Sep 17 00:00:00 2001 From: pankdm Date: Mon, 16 Sep 2013 17:42:07 +0000 Subject: [PATCH] Fixed some warnings + added compile flags to mute some warnings that don't have an obvious fix --- projects/mtg/src/AllAbilities.cpp | 3 ++- projects/mtg/src/ExtraCost.cpp | 1 - projects/mtg/src/MTGAbility.cpp | 2 -- projects/mtg/wagic-qt.pro | 3 +++ 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/projects/mtg/src/AllAbilities.cpp b/projects/mtg/src/AllAbilities.cpp index 52d4a0afb..0f10f8ead 100644 --- a/projects/mtg/src/AllAbilities.cpp +++ b/projects/mtg/src/AllAbilities.cpp @@ -2962,7 +2962,8 @@ int AARemoveMana::resolve() if (player->doesntEmpty->getConvertedCost() && !player->poolDoesntEmpty->getConvertedCost()) { ManaCost * toRemove = manaPool->Diff(player->doesntEmpty); - player->getManaPool()->pay(manaPool->Diff(player->doesntEmpty)); + player->getManaPool()->pay(toRemove); + delete(toRemove); return 1; } else if(!player->doesntEmpty->getConvertedCost() && player->poolDoesntEmpty->getConvertedCost()) diff --git a/projects/mtg/src/ExtraCost.cpp b/projects/mtg/src/ExtraCost.cpp index 3a563f7df..f4267ee68 100644 --- a/projects/mtg/src/ExtraCost.cpp +++ b/projects/mtg/src/ExtraCost.cpp @@ -96,7 +96,6 @@ int extraManaCost::isPaymentSet() int extraManaCost::canPay() { - MTGCardInstance * _target = (MTGCardInstance *) target; if(!source->controller()->getManaPool()->canAfford(costToPay)) { return 0; diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 3e747f8d6..6b1f84aca 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -1462,7 +1462,6 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG vector splitMayPay = parseBetween(s, "pay(", ")", true); if(splitMayPay.size()) { - MTGAbility * a1 = NULL; GenericPaidAbility * a = NEW GenericPaidAbility(observer, id, card, target,newName,castRestriction,splitMayPay[1],storedPayString); a->oneShot = 1; a->canBeInterrupted = false; @@ -1967,7 +1966,6 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG vector splitMayPaysub = parseBetween(s, "pay[[","]]", true); if(splitMayPaysub.size()) { - MTGAbility * a1 = NULL; GenericPaidAbility * a = NEW GenericPaidAbility(observer, id, card, target,newName,castRestriction,splitMayPaysub[1],storedPayString); a->oneShot = 1; a->canBeInterrupted = false; diff --git a/projects/mtg/wagic-qt.pro b/projects/mtg/wagic-qt.pro index da0ad9120..44d9d21db 100644 --- a/projects/mtg/wagic-qt.pro +++ b/projects/mtg/wagic-qt.pro @@ -12,6 +12,9 @@ TEMPLATE = app #!macx:CONFIG += precompile_header unix|macx:QMAKE_CXXFLAGS += -Wno-unused-parameter +unix|macx:QMAKE_CXXFLAGS += -Wno-unused-but-set-parameter +unix|macx:QMAKE_CXXFLAGS += -Wno-unused-but-set-variable +unix|macx:QMAKE_CXXFLAGS += -Wno-unused-value unix|macx:!maemo5:!symbian:QMAKE_CXXFLAGS += -Werror windows:DEFINES += _CRT_SECURE_NO_WARNINGS unix|macx:DEFINES += LINUX