sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

0.8.3 translation source update, list refactoring for crash bugfix in qt/*

Browse Source
This commit is contained in:
doitux
2011-01-11 23:13:55 +00:00
parent 6028ae57b7
commit 0fffc9476e
29 changed files with 11849 additions and 9752 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/gametable/myavatarlabel.cpp
+10 -9
View File
@@ -48,15 +48,15 @@ void MyAvatarLabel::contextMenuEvent ( QContextMenuEvent *event ) {
assert(myW->getSession()->getCurrentGame());
if (myW->getSession()->isNetworkClientRunning()) {
PlayerListIterator it = myW->getSession()->getCurrentGame()->getSeatsList()->begin();
boost::shared_ptr<PlayerInterface> humanPlayer = myW->getSession()->getCurrentGame()->getSeatsList()->front();
//only active players are allowed to start a vote
if((*it)->getMyActiveStatus()) {
if(humanPlayer->getMyActiveStatus()) {
Game *currentGame = myW->getSession()->getCurrentGame();
PlayerListConstIterator it_c;
int activePlayerCounter=0;
for (it_c=currentGame->getSeatsList()->begin(); it_c!=currentGame->getSeatsList()->end(); it_c++) {
PlayerList seatList = currentGame->getSeatsList();
for (it_c=seatList->begin(); it_c!=seatList->end(); it_c++) {
if((*it_c)->getMyActiveStatus()) activePlayerCounter++;
}
GameInfo info(myW->getSession()->getClientGameInfo(myW->getSession()->getClientCurrentGameId()));
@@ -71,7 +71,7 @@ void MyAvatarLabel::contextMenuEvent ( QContextMenuEvent *event ) {
action_IgnorePlayer->setEnabled(true);
int j=0;
for (it_c=currentGame->getSeatsList()->begin(); it_c!=currentGame->getSeatsList()->end(); it_c++) {
for (it_c=seatList->begin(); it_c!=seatList->end(); it_c++) {
if(myId == j) {
@@ -90,7 +90,7 @@ void MyAvatarLabel::contextMenuEvent ( QContextMenuEvent *event ) {
}
int i=0;
for (it_c=currentGame->getSeatsList()->begin(); it_c!=currentGame->getSeatsList()->end(); it_c++) {
for (it_c=seatList->begin(); it_c!=seatList->end(); it_c++) {
//also inactive player which stays on table can be voted to kick
if(myContextMenuEnabled && myId != 0 && myId == i && (*it_c)->getMyType() != PLAYER_TYPE_COMPUTER && ( (*it_c)->getMyActiveStatus() || (*it_c)->getMyStayOnTableStatus() ) )
@@ -182,8 +182,8 @@ void MyAvatarLabel::putPlayerOnIgnoreList() {
QStringList list;
PlayerListConstIterator it_c;
for (it_c=myW->getSession()->getCurrentGame()->getSeatsList()->begin(); it_c!=myW->getSession()->getCurrentGame()->getSeatsList()->end(); it_c++) {
PlayerList seatList = myW->getSession()->getCurrentGame()->getSeatsList();
for (it_c=seatList->begin(); it_c!=seatList->end(); it_c++) {
list << QString::fromUtf8((*it_c)->getMyName().c_str());
}
@@ -207,7 +207,8 @@ void MyAvatarLabel::reportBadAvatar() {
Game *currentGame = myW->getSession()->getCurrentGame();
int j=0;
PlayerListConstIterator it_c;
for (it_c=currentGame->getSeatsList()->begin(); it_c!=currentGame->getSeatsList()->end(); it_c++) {
PlayerList seatList = currentGame->getSeatsList();
for (it_c=seatList->begin(); it_c!=seatList->end(); it_c++) {
if(myId == j) {