Merge remote-tracking branch 'refs/remotes/WagicProject/master'

This commit is contained in:
Anthony Calosa
2017-02-01 09:33:35 +08:00
4 changed files with 15 additions and 15 deletions
+1 -1
View File
@@ -852,7 +852,7 @@ void TestSuiteGame::initGame()
p->life = initState.players[i]->life;
p->poisonCount = initState.players[i]->poisonCount;
stringstream stream;
stream << initState.players[i]->getRandomGenerator()->saveLoadedRandValues(stream);
initState.players[i]->getRandomGenerator()->saveLoadedRandValues(stream);
p->getRandomGenerator()->loadRandValues(stream.str());
MTGGameZone * playerZones[] = { p->game->graveyard, p->game->library, p->game->hand, p->game->inPlay, p->game->removedFromGame };
MTGGameZone * loadedPlayerZones[] = { initState.players[i]->game->graveyard,
+2 -2
View File
@@ -49,9 +49,9 @@ ostream& RandomGenerator::saveUsedRandValues(ostream& out) const
return out;
}
ostream& RandomGenerator::saveLoadedRandValues(ostream& out)
ostream& RandomGenerator::saveLoadedRandValues(ostream& out) const
{
list<int>::iterator ite;
list<int>::const_iterator ite;
for(ite=loadedRandomValues.begin(); ite != loadedRandomValues.end(); ite++)
{
out << *ite << ",";