Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Erwan

Browse Source 
- submit a fix for TestSuiteAI, I don't understand why it wasn't submitted with my other changes yesterday. This fixes a bug in the test suite (One storm test would fail without this)
- minor refactor to AI code
This commit is contained in:
wagic.the.homebrew@gmail.com
2011-02-14 13:29:27 +00:00
parent b3468782f1
commit 5b365e53f0
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/AIPlayer.cpp
+7 -10
View File
@@ -994,9 +994,9 @@ int AIPlayer::chooseBlockers()
{ {
GameObserver * g = GameObserver::GetInstance(); GameObserver * g = GameObserver::GetInstance();
if (g->currentActionPlayer != this) if (g->currentActionPlayer != this)
return 0; return 0;
if(g->isInterrupting == this) if(g->isInterrupting == this)
return 0; return 0;
//ai should not be allowed to run this if it is not legally allowed to do so //ai should not be allowed to run this if it is not legally allowed to do so
//this fixes a bug where ai would try to use this as an interupt //this fixes a bug where ai would try to use this as an interupt
//when ai is given priority to select blockers it is allowed to run this as normal. //when ai is given priority to select blockers it is allowed to run this as normal.
@@ -1337,13 +1337,15 @@ int AIPlayerBaka::computeActions()
if (game->playRestrictions->canPutIntoZone(nextCardToPlay, game->stack) == PlayRestriction::CANT_PLAY) if (game->playRestrictions->canPutIntoZone(nextCardToPlay, game->stack) == PlayRestriction::CANT_PLAY)
nextCardToPlay = NULL; nextCardToPlay = NULL;
} }
SAFE_DELETE (icurrentMana);
if (!nextCardToPlay) if (!nextCardToPlay)
{ {
selectAbility(); selectAbility();
} }
if (icurrentMana != NULL)
delete (icurrentMana);
if (nextCardToPlay) if (nextCardToPlay)
{ {
if (ipotential) if (ipotential)
@@ -1389,13 +1391,8 @@ int AIPlayerBaka::computeActions()
count++; count++;
} }
if (!nextCardToPlay) SAFE_DELETE(currentMana);
{
selectAbility();
}
if (currentMana != NULL)
delete (currentMana);
if (nextCardToPlay) if (nextCardToPlay)
{ {
if (potential) if (potential)
projects/mtg/src/TestSuiteAI.cpp
+1
View File
@@ -423,6 +423,7 @@ void TestSuite::initGame()
} }
zone->cardsSeenThisTurn.clear(); //don't consider those cards as having moved in this area during this turn zone->cardsSeenThisTurn.clear(); //don't consider those cards as having moved in this area during this turn
} }
p->game->stack->cardsSeenThisTurn.clear(); //don't consider those cards as having moved in this area during this turn
} }
DebugTrace("TESTUITE Init Game Done !"); DebugTrace("TESTUITE Init Game Done !");
} }