Fixed assertion fix again.

This commit is contained in:
lotodore
2007-10-03 12:28:10 +00:00
parent 4354188589
commit 81f206284d
+16 -16
View File
@@ -145,12 +145,6 @@ void Game::initHand()
PlayerListConstIterator it_c; PlayerListConstIterator it_c;
PlayerListIterator it, it_2; PlayerListIterator it, it_2;
// eventuell vorhandene Hand löschen
if(actualHand) {
delete actualHand;
actualHand = 0;
}
actualHandID++; actualHandID++;
// calculate smallBlind // calculate smallBlind
@@ -180,21 +174,27 @@ void Game::initHand()
} }
} }
// eventuell vorhandene Hand löschen
if(actualHand) {
// TODO HACK // TODO HACK
for(it=seatsList->begin(); it!=seatsList->end(); it++) { for(it=seatsList->begin(); it!=seatsList->end(); it++) {
if (!(*it)->getMyActiveStatus()) if (!(*it)->getMyActiveStatus())
{
if ((*it)->getMyUniqueID() == getCurrentHand()->getCurrentBeRo()->getCurrentPlayersTurnId())
{ {
it_2 = it; if ((*it)->getMyUniqueID() == getCurrentHand()->getCurrentBeRo()->getCurrentPlayersTurnId())
it_2++; {
if (it_2 == seatsList->end()) it_2 = it;
it_2 = seatsList->begin(); it_2++;
getCurrentHand()->getCurrentBeRo()->setCurrentPlayersTurnId((*it_2)->getMyUniqueID()); if (it_2 == seatsList->end())
it_2 = seatsList->begin();
getCurrentHand()->getCurrentBeRo()->setCurrentPlayersTurnId((*it_2)->getMyUniqueID());
}
} }
} }
}
delete actualHand;
actualHand = 0;
}
runningPlayerList->clear(); runningPlayerList->clear();
(*runningPlayerList) = (*activePlayerList); (*runningPlayerList) = (*activePlayerList);