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

init'ed the variable "mFindingAbility" bool in Aiplayer constructor and changed its name from previous name "findingAbility" to keep in line with recent code rules.

Browse Source 
added COMMENTS to explain the variable.
This commit is contained in:
omegablast2002@yahoo.com
2010-12-03 12:10:35 +00:00
parent e71fb8ff46
commit 336b25c0f5
3 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
projects/mtg/include/AIPlayer.h
View File

@@ -59,7 +59,7 @@ protected:
//Variables used by Test suite
MTGCardInstance * nextCardToPlay;
queue<AIAction *> clickstream;
bool findingAbility;
bool mFindingAbility;//is Ai currently looking for an activated ability to use?
void tapLandsForMana(ManaCost * cost, MTGCardInstance * card = NULL);
int orderBlockers();
int combatDamages();

8
projects/mtg/src/AIMomirPlayer.cpp
View File

@@ -85,9 +85,9 @@ int AIMomirPlayer::computeActions()
int currentGamePhase = g->getCurrentGamePhase();
if (g->isInterrupting == this)
{ // interrupting
if (!findingAbility)
if (!mFindingAbility)//if not looking for an activated ability to use, then go ahead and look now.
{
AIPlayer::findingAbility = true;
mFindingAbility = true;
selectAbility();
}
return 1;
@@ -123,9 +123,9 @@ int AIMomirPlayer::computeActions()
break;
}
case Constants::MTG_PHASE_SECONDMAIN:
if (!findingAbility)
if (!mFindingAbility)//if not looking for an activated ability to use, then go ahead and look now.
{
AIPlayer::findingAbility = true;
mFindingAbility = true;
selectAbility();
}
return 1;

29
projects/mtg/src/AIPlayer.cpp
View File

@@ -43,6 +43,7 @@ AIPlayer::AIPlayer(MTGDeck * deck, string file, string fileSmall) :
agressivity = 50;
forceBestAbilityUse = false;
Checked = false;
mFindingAbility = false;
playMode = Player::MODE_AI;
}
@@ -618,7 +619,7 @@ int AIPlayer::selectAbility()
if (a && a != it2->first) delete (it2->first);
}
}
AIPlayer::findingAbility = false;
mFindingAbility = false;
return 1;
}
@@ -1099,7 +1100,11 @@ int AIPlayerBaka::computeActions()
{
GameObserver * g = GameObserver::GetInstance();
Player * p = g->currentPlayer;
AIPlayer::findingAbility = false;
mFindingAbility = false;
//set to false at start of compute actions,
//Ai will then selectAbility often before this function is done running
//each time setting it to true until the end of selectAbility() function is reached
//this prevents overlaps of selectAbility function.
if (!(g->currentlyActing() == this)) return 0;
if (g->mLayers->actionLayer()->menuObject)
{
@@ -1110,9 +1115,9 @@ int AIPlayerBaka::computeActions()
int currentGamePhase = g->getCurrentGamePhase();
if (g->isInterrupting == this)
{ // interrupting
if (!findingAbility)
if (!mFindingAbility)//if not looking for an activated ability to use, then go ahead and look now.
{
AIPlayer::findingAbility = true;
mFindingAbility = true;
selectAbility();
}
return 1;
@@ -1135,9 +1140,9 @@ int AIPlayerBaka::computeActions()
potential = true;
}
nextCardToPlay = FindCardToPlay(currentMana, "land");
if (!findingAbility)
if (!mFindingAbility)//if not looking for an activated ability to use, then go ahead and look now.
{
AIPlayer::findingAbility = true;
mFindingAbility = true;
selectAbility();
}
//look for the most expensive creature we can afford
@@ -1173,9 +1178,9 @@ int AIPlayerBaka::computeActions()
}
if (!nextCardToPlay)
{
if (!findingAbility)
if (!mFindingAbility)//if not looking for an activated ability to use, then go ahead and look now.
{
AIPlayer::findingAbility = true;
mFindingAbility = true;
selectAbility();
}
}
@@ -1225,9 +1230,9 @@ int AIPlayerBaka::computeActions()
}
else
{
if (!findingAbility)
if (!mFindingAbility)//if not looking for an activated ability to use, then go ahead and look now.
{
AIPlayer::findingAbility = true;
mFindingAbility = true;
selectAbility();
}
}
@@ -1245,9 +1250,9 @@ int AIPlayerBaka::computeActions()
Checked = false;
break;
default:
if (!findingAbility)
if (!mFindingAbility)//if not looking for an activated ability to use, then go ahead and look now.
{
AIPlayer::findingAbility = true;
mFindingAbility = true;
selectAbility();
}
break;