diff --git a/projects/mtg/include/GameStateDeckViewer.h b/projects/mtg/include/GameStateDeckViewer.h index a0335c048..70c9726aa 100644 --- a/projects/mtg/include/GameStateDeckViewer.h +++ b/projects/mtg/include/GameStateDeckViewer.h @@ -599,7 +599,6 @@ class GameStateDeckViewer: public GameState, public JGuiListener float max_scale = 0.96; - float min_scale = 0.2; float x_center_0 = 180; float right_border = SCREEN_WIDTH - 20 ; diff --git a/projects/mtg/src/AIPlayer.cpp b/projects/mtg/src/AIPlayer.cpp index d88cbcea6..13d5f5902 100644 --- a/projects/mtg/src/AIPlayer.cpp +++ b/projects/mtg/src/AIPlayer.cpp @@ -47,7 +47,6 @@ void AIPlayer::tapLandsForMana(ManaCost * potentialMana, ManaCost * cost){ #endif ManaCost * diff = potentialMana->Diff(cost); - int currentCost = 0; GameObserver * gameObs = GameObserver::GetInstance(); CardDescriptor cd; cd.setColor(Constants::MTG_COLOR_LAND); @@ -246,9 +245,9 @@ int AIPlayer::chooseAttackers(){ int AIPlayer::chooseBlockers(){ map opponentsToughness; int opponentForce = getCreaturesInfo(opponent(),INFO_CREATURESPOWER); - int opponentCreatures = getCreaturesInfo(opponent(), INFO_NBCREATURES, -1); - int myForce = getCreaturesInfo(this,INFO_CREATURESPOWER); - int myCreatures = getCreaturesInfo(this, INFO_NBCREATURES, -1); + //int opponentCreatures = getCreaturesInfo(opponent(), INFO_NBCREATURES, -1); + //int myForce = getCreaturesInfo(this,INFO_CREATURESPOWER); + //int myCreatures = getCreaturesInfo(this, INFO_NBCREATURES, -1); CardDescriptor cd; cd.init(); cd.setType("Creature"); @@ -307,7 +306,6 @@ int AIPlayer::chooseBlockers(){ int AIPlayer::combatDamages(){ int result = 0; GameObserver * gameObs = GameObserver::GetInstance(); - Player * currentPlayer = gameObs->currentPlayer; int currentGamePhase = gameObs->getCurrentGamePhase(); if (currentGamePhase != Constants::MTG_PHASE_COMBATDAMAGE) return 0; DamageResolverLayer * drl = gameObs->mLayers->combatLayer(); diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index 7fa5fbabd..720ab625b 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -242,7 +242,7 @@ int AbilityFactory::magicText(int id, Spell * spell, MTGCardInstance * card){ end = s.find(",",previous); string spt = s.substr(previous,end - previous); int power, toughness; - //int havePowertoughness = parsePowerToughness(spt,&power, &toughness); + parsePowerToughness(spt,&power, &toughness); string sabilities = s.substr(end+1); ManaCost * cost = ManaCost::parseManaCost(s); int multiplier = 1; diff --git a/projects/mtg/src/MTGCard.cpp b/projects/mtg/src/MTGCard.cpp index 54dc4d565..ae9d2bb00 100644 --- a/projects/mtg/src/MTGCard.cpp +++ b/projects/mtg/src/MTGCard.cpp @@ -112,7 +112,6 @@ void MTGCard::setColor(int _color, int removeAllOthers){ } int MTGCard::getColor(){ - int i = 0; for (int i=0; iplayers[playerid]; - int life = player->life; //Avatar GuiAvatar * avatar = (GuiAvatar *)mObjects[3*playerid]; diff --git a/projects/mtg/src/TestSuiteAI.cpp b/projects/mtg/src/TestSuiteAI.cpp index a1ba9264d..625549007 100644 --- a/projects/mtg/src/TestSuiteAI.cpp +++ b/projects/mtg/src/TestSuiteAI.cpp @@ -53,7 +53,7 @@ int TestSuiteAI::Act(float dt){ OutputDebugString(action.c_str()); OutputDebugString("\n"); - + if (g->mLayers->stackLayer()->askIfWishesToInterrupt == this){ if(action.compare("no") != 0 && action.compare("yes") != 0){ g->mLayers->stackLayer()->cancelInterruptOffer();