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

Fix players vector (had a couple of 4 players game with the new code), added more cleanup

Browse Source
This commit is contained in:
Xawotihs
2011-10-01 23:49:37 +00:00
parent 76a8f406ec
commit 483c767492
8 changed files with 39 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
projects/mtg/src/TestSuiteAI.cpp
View File

@@ -255,10 +255,6 @@ void TestSuiteActions::add(string s)
TestSuiteState::TestSuiteState()
{
for(size_t p = 0;p < players.size();++p)
{
players[p] = 0;
}
players.clear();
}
@@ -294,33 +290,30 @@ MTGPlayerCards * TestSuite::buildDeck(Player* player, int playerId)
int list[100];
int nbcards = 0;
MTGPlayerCards * deck = NULL;
if(initState.players.size())
{
if(initState.players.size() > size_t(playerId))
{
MTGGameZone * loadedPlayerZones[] = { initState.players[playerId]->game->graveyard,
initState.players[playerId]->game->library,
initState.players[playerId]->game->hand,
initState.players[playerId]->game->inPlay };
for (int j = 0; j < 4; j++)
if(initState.players.size() > (size_t)playerId)
{
MTGGameZone * loadedPlayerZones[] = { initState.players[playerId]->game->graveyard,
initState.players[playerId]->game->library,
initState.players[playerId]->game->hand,
initState.players[playerId]->game->inPlay };
for (int j = 0; j < 4; j++)
{
for (size_t k = 0; k < loadedPlayerZones[j]->cards.size(); k++)
{
for (size_t k = 0; k < loadedPlayerZones[j]->cards.size(); k++)
{
int cardid = loadedPlayerZones[j]->cards[k]->getId();
list[nbcards] = cardid;
nbcards++;
}
int cardid = loadedPlayerZones[j]->cards[k]->getId();
list[nbcards] = cardid;
nbcards++;
}
deck = NEW MTGPlayerCards(player, list, nbcards);
}
else
deck = NEW MTGPlayerCards();
deck = NEW MTGPlayerCards(player, list, nbcards);
}
else
{
deck = NEW MTGPlayerCards();
}
return deck;
}