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

Merge pull request #143 from openjck/two-pair

Browse Source 
Renamed the hand "Two Pairs" to "Two Pair".
This commit is contained in:
doitux
2012-08-15 04:55:19 -07:00
parent dd0ab6c617 8a3e3cb155
commit 9b75b2ed8c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/local_engine/cardsvalue.cpp
+3 -3
View File
@@ -954,7 +954,7 @@ std::string CardsValue::determineHandName(int myCardsValueInt, PlayerList active
} }
} }
break; break;
// Two Pairs // Two Pair
case 2: { case 2: {
handName = *cardStringIt_c; handName = *cardStringIt_c;
@@ -1775,9 +1775,9 @@ std::list<std::string> CardsValue::translateCardsValueCode(int cardsValueCode)
} }
} }
break; break;
// Two Pairs // Two Pair
case 2: { case 2: {
cardString.push_back("Two Pairs, "); cardString.push_back("Two Pair, ");
// erster Pair // erster Pair
switch(secondPart) { switch(secondPart) {
case 12: case 12:
src/gui/qt/gametable/mychancelabel.cpp
+1 -1
View File
@@ -180,7 +180,7 @@ void MyChanceLabel::paintEvent(QPaintEvent * /*event*/)
} else { } else {
painter.setPen(possible); painter.setPen(possible);
} }
painter.drawText(QRectF(QPointF(2,start_y+7*height), QPointF(text_width,start_y+8*height)),Qt::AlignRight,"Two Pairs"); painter.drawText(QRectF(QPointF(2,start_y+7*height), QPointF(text_width,start_y+8*height)),Qt::AlignRight,"Two Pair");
painter.drawText(QRectF(QPointF(percent_start,start_y+7*height), QPointF(percent_start+percent_width,start_y+8*height)),Qt::AlignRight,QString("%1%").arg(TPChance[0])); painter.drawText(QRectF(QPointF(percent_start,start_y+7*height), QPointF(percent_start+percent_width,start_y+8*height)),Qt::AlignRight,QString("%1%").arg(TPChance[0]));
if(OPChance[1] == 0 || myFoldState) { if(OPChance[1] == 0 || myFoldState) {
painter.setPen(impossible); painter.setPen(impossible);