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

Merge branch 'master' of github.com:/pokerth/pokerth

Browse Source
This commit is contained in:
lotodore
2013-04-01 23:38:00 +02:00
parent 904069e02e 52830ba4a6
commit baf3bf9e1e
5 changed files with 10218 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/local_engine/localplayer.cpp
+1 -1
View File
@@ -3452,7 +3452,7 @@ int LocalPlayer::flopCardsValue(int* cards)
return (71000 + temp*100 + array[j1][1]);
} else {
// Test auf Straight-Flush-Ausnahme 5-4-3-2-A
if(array[j1][1] == 12 && (array[j1+1][1]<=3 || (array[j1+2][1]<=3 && array[j1][0]==array[j1+4][0]))) {
if(array[j1][1] == 12 && (array[j1+1][1]<=3 || (j1==0 && array[j1+2][1]<=3 && array[j1][0]==array[j1+4][0]))) {
// cout << "Straight-Flush-Draw Ass unten";
for(j2=0; j2<4; j2++) {
if(array[j1+j2][2] <= 1) temp++;
src/gui/qt/settingsdialog/settingsdialogimpl.cpp
+1
View File
@@ -78,6 +78,7 @@ settingsDialogImpl::settingsDialogImpl(QWidget *parent, ConfigFile *c, selectAva
comboBox_switchLanguage->addItem(QString(tr("English")+" "+QString::fromUtf8("(English)")),"en");
comboBox_switchLanguage->addItem(QString(tr("Finnish")+" "+QString::fromUtf8("(suomi)")),"fi");
comboBox_switchLanguage->addItem(QString(tr("French")+" "+QString::fromUtf8("(français)")),"fr");
comboBox_switchLanguage->addItem(QString(tr("Galician")+" "+QString::fromUtf8("(Galego)")),"gl");
comboBox_switchLanguage->addItem(QString(tr("German")+" "+QString::fromUtf8("(Deutsch)")),"de");
comboBox_switchLanguage->addItem(QString(tr("Greek")+" "+QString::fromUtf8("(Ελληνικά)")),"gr");
comboBox_switchLanguage->addItem(QString(tr("Hungarian")+" "+QString::fromUtf8("(Magyar)")),"hu");