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

Browse Source
This commit is contained in:
doitux
2007-03-27 21:36:56 +00:00
parent b3afd51b3e
commit 91391eed5c
14 changed files with 162 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/local_engine/localplayer.cpp
+10 -6
View File
@@ -114,7 +114,7 @@ void LocalPlayer::action() {
default: {}
}
cout << myID << ": " << myAction << endl;
myTurn = 0;
// cout << "jetzt" << endl;
@@ -215,7 +215,7 @@ void LocalPlayer::preflopEngine() {
}
}
evaluation(myAction, bet, raise);
evaluation(bet, raise);
}
@@ -331,7 +331,7 @@ void LocalPlayer::flopEngine() {
cout << myID << ": Dude " << myDude4 << "\t Wert " << myOdds << "\t Niveau " << myNiveau[0] << " " << myNiveau[1] << " " << myNiveau[2] << endl;
evaluation(myAction, bet, raise);
evaluation(bet, raise);
@@ -775,7 +775,7 @@ void LocalPlayer::turnEngine() {
}
evaluation(myAction, bet, raise);
evaluation(bet, raise);
}
@@ -970,7 +970,7 @@ void LocalPlayer::riverEngine() {
}
evaluation(myAction, bet, raise);
evaluation(bet, raise);
@@ -979,7 +979,7 @@ void LocalPlayer::riverEngine() {
void LocalPlayer::evaluation(int myAction, int bet, int raise) {
void LocalPlayer::evaluation(int bet, int raise) {
int highestSet = 0;
@@ -995,6 +995,8 @@ void LocalPlayer::evaluation(int myAction, int bet, int raise) {
default: cout << "ERROR - wrong init of actualRound" << endl;
}
cout << "evaluation: " << myAction << " highestSet " << highestSet << " myCash " << myCash << endl;
switch(myAction) {
// none
case 0: {}
@@ -1012,6 +1014,7 @@ void LocalPlayer::evaluation(int myAction, int bet, int raise) {
mySet += myCash;
myCash = 0;
myAction = 6;
cout << "dfgsdfg" << endl;
}
// sonst
else {
@@ -1072,6 +1075,7 @@ void LocalPlayer::evaluation(int myAction, int bet, int raise) {
default: cout << "ERROR - wrong init of actualRound" << endl;
}
}
src/engine/local_engine/localplayer.h
+1 -1
View File
@@ -120,7 +120,7 @@ public:
void readFile();
void evaluation(int, int, int);
void evaluation(int, int);
private:
src/gui/qt/mainwindow.ui
+121 -115
View File
@@ -774,10 +774,10 @@
<widget class="QLabel" name="textLabel_Status2" >
<property name="geometry" >
<rect>
<x>24</x>
<y>29</y>
<width>72</width>
<height>53</height>
<x>9</x>
<y>35</y>
<width>100</width>
<height>40</height>
</rect>
</property>
<property name="minimumSize" >
@@ -839,38 +839,6 @@
<property name="title" >
<string/>
</property>
<widget class="QFrame" name="frame_Cards3" >
<property name="geometry" >
<rect>
<x>85</x>
<y>40</y>
<width>118</width>
<height>111</height>
</rect>
</property>
<widget class="QLabel" name="textLabel_Status3" >
<property name="geometry" >
<rect>
<x>24</x>
<y>29</y>
<width>72</width>
<height>53</height>
</rect>
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
</widget>
</widget>
<widget class="QFrame" name="frame_4" >
<property name="geometry" >
<rect>
@@ -1083,6 +1051,38 @@
<pixmap/>
</property>
</widget>
<widget class="QFrame" name="frame_Cards3" >
<property name="geometry" >
<rect>
<x>85</x>
<y>40</y>
<width>118</width>
<height>111</height>
</rect>
</property>
<widget class="QLabel" name="textLabel_Status3" >
<property name="geometry" >
<rect>
<x>9</x>
<y>35</y>
<width>100</width>
<height>40</height>
</rect>
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
</widget>
</widget>
</widget>
</item>
<item>
@@ -1127,10 +1127,10 @@
<widget class="QLabel" name="textLabel_Status4" >
<property name="geometry" >
<rect>
<x>24</x>
<y>29</y>
<width>72</width>
<height>53</height>
<x>9</x>
<y>35</y>
<width>100</width>
<height>40</height>
</rect>
</property>
<property name="minimumSize" >
@@ -1403,10 +1403,10 @@
<widget class="QLabel" name="textLabel_Status5" >
<property name="geometry" >
<rect>
<x>24</x>
<y>29</y>
<width>72</width>
<height>53</height>
<x>9</x>
<y>35</y>
<width>100</width>
<height>40</height>
</rect>
</property>
<property name="minimumSize" >
@@ -1727,10 +1727,16 @@
<height>16777215</height>
</size>
</property>
<property name="styleSheet" >
<string>QTabWidget { background-image: url(:/graphics/resources/graphics/1px.png) }</string>
</property>
<property name="currentIndex" >
<number>0</number>
</property>
<widget class="QWidget" name="tab_log_2" >
<property name="styleSheet" >
<string>QWidget { background-image: url(:/graphics/resources/graphics/1px.png) }</string>
</property>
<attribute name="title" >
<string>Hands</string>
</attribute>
@@ -2115,28 +2121,6 @@
<set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
</property>
</widget>
<widget class="QLabel" name="textLabel_Status0" >
<property name="geometry" >
<rect>
<x>320</x>
<y>110</y>
<width>72</width>
<height>53</height>
</rect>
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
</widget>
<widget class="QFrame" name="frame_Cards0" >
<property name="geometry" >
<rect>
@@ -2146,6 +2130,28 @@
<height>111</height>
</rect>
</property>
<widget class="QLabel" name="textLabel_Status0" >
<property name="geometry" >
<rect>
<x>9</x>
<y>35</y>
<width>100</width>
<height>40</height>
</rect>
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
</widget>
</widget>
<widget class="QLabel" name="label_Avatar0" >
<property name="geometry" >
@@ -2701,6 +2707,19 @@
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
</property>
</widget>
<widget class="QLabel" name="label_Avatar1" >
<property name="geometry" >
<rect>
<x>17</x>
<y>17</y>
<width>50</width>
<height>50</height>
</rect>
</property>
<property name="pixmap" >
<pixmap/>
</property>
</widget>
<widget class="QFrame" name="frame_Cards1" >
<property name="geometry" >
<rect>
@@ -2713,10 +2732,10 @@
<widget class="QLabel" name="textLabel_Status1" >
<property name="geometry" >
<rect>
<x>24</x>
<y>29</y>
<width>72</width>
<height>53</height>
<x>9</x>
<y>35</y>
<width>100</width>
<height>40</height>
</rect>
</property>
<property name="minimumSize" >
@@ -2733,19 +2752,6 @@
</property>
</widget>
</widget>
<widget class="QLabel" name="label_Avatar1" >
<property name="geometry" >
<rect>
<x>17</x>
<y>17</y>
<width>50</width>
<height>50</height>
</rect>
</property>
<property name="pixmap" >
<pixmap/>
</property>
</widget>
</widget>
</item>
</layout>
@@ -3602,38 +3608,6 @@
<property name="title" >
<string/>
</property>
<widget class="QFrame" name="frame_Cards6" >
<property name="geometry" >
<rect>
<x>85</x>
<y>40</y>
<width>118</width>
<height>111</height>
</rect>
</property>
<widget class="QLabel" name="textLabel_Status6" >
<property name="geometry" >
<rect>
<x>20</x>
<y>80</y>
<width>72</width>
<height>53</height>
</rect>
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
</widget>
</widget>
<widget class="QFrame" name="frame_16" >
<property name="geometry" >
<rect>
@@ -3846,6 +3820,38 @@
<pixmap/>
</property>
</widget>
<widget class="QFrame" name="frame_Cards6" >
<property name="geometry" >
<rect>
<x>85</x>
<y>40</y>
<width>118</width>
<height>111</height>
</rect>
</property>
<widget class="QLabel" name="textLabel_Status6" >
<property name="geometry" >
<rect>
<x>9</x>
<y>35</y>
<width>100</width>
<height>40</height>
</rect>
</property>
<property name="minimumSize" >
<size>
<width>0</width>
<height>20</height>
</size>
</property>
<property name="text" >
<string/>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
</property>
</widget>
</widget>
</widget>
</item>
</layout>
src/gui/qt/mainwindow/mainwindowimpl.cpp
+19 -24
View File
@@ -54,7 +54,7 @@ const int maxQuantityPlayersConst = 7;
using namespace std;
mainWindowImpl::mainWindowImpl(QMainWindow *parent)
: QMainWindow(parent), actualGame(0), actualHand(0), mySession(0), maxQuantityPlayers(maxQuantityPlayersConst), gameSpeed(0), debugMode(1), breakAfterActualHand(FALSE)
: QMainWindow(parent), actualGame(0), actualHand(0), mySession(0), maxQuantityPlayers(maxQuantityPlayersConst), gameSpeed(0), debugMode(0), breakAfterActualHand(FALSE)
{
int i;
@@ -441,7 +441,7 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
cashLabelArray[i]->setFont(tmpFont2);
}
tmpFont2.setPixelSize(11);
tmpFont2.setPixelSize(12);
for (i=0; i<maxQuantityPlayers; i++) {
setLabelArray[i]->setFont(tmpFont2);
@@ -476,11 +476,8 @@ mainWindowImpl::mainWindowImpl(QMainWindow *parent)
}
// for (i=0; i<maxQuantityPlayers; i++) {
//
// // groupBoxArray[i]->setStyleSheet("QGroupBox { border:none }");
//
// }
//raise actionLable above just inserted mypixmaplabel
for (i=0; i<maxQuantityPlayers; i++) { actionLabelArray[i]->raise(); }
//ShortCuts
@@ -832,35 +829,33 @@ void mainWindowImpl::refreshPlayerAvatar() {
void mainWindowImpl::refreshAction() {
QPixmap onePix(":/graphics/resources/graphics/1px.png");
QPixmap action;
QStringList actionArray;
actionArray << "" << "Fold" << "Check" << "Call" << "Bet" << "Raise" << "All-In";
actionArray << "" << "fold" << "check" << "call" << "bet" << "raise" << "allin";
int i;
for (i=0; i<maxQuantityPlayers; i++) {
actionLabelArray[i]->setText("<p align='center'>"+actionArray[actualHand->getPlayerArray()[i]->getMyAction()]+"</p>");
//if no action --> clear Pixmap
if(actualHand->getPlayerArray()[i]->getMyAction() == 0) {
actionLabelArray[i]->setPixmap(onePix);
}
else {
//paint action pixmap and raise
actionLabelArray[i]->setPixmap(QPixmap(":/actions/resources/graphics/actions/action_"+actionArray[actualHand->getPlayerArray()[i]->getMyAction()]+".png"));
}
if (actualHand->getPlayerArray()[i]->getMyAction()==1) {
// groupBoxArray[i]->setDisabled(TRUE);
QPixmap onePix(":/graphics/resources/graphics/1px.png");
if(i != 0) {
holeCardsArray[i][0]->setPixmap(onePix, FALSE);
holeCardsArray[i][1]->setPixmap(onePix, FALSE);
}
// QColor c(199,199,199);
// QPalette labelPalette = cashTopLabelArray[i]->palette();
// labelPalette.setColor(QPalette::WindowText, c);
// cashTopLabelArray[i]->setPalette(labelPalette);
// cashTopLabelArray[i]->setAutoFillBackground(FALSE);
}
// else {
// QColor c(0,0,0);
// QPalette labelPalette = cashTopLabelArray[i]->palette();
// labelPalette.setColor(QPalette::WindowText, c);
// cashTopLabelArray[i]->setPalette(labelPalette);
// cashTopLabelArray[i]->setAutoFillBackground(FALSE);
// }
}
}
@@ -1588,7 +1583,7 @@ void mainWindowImpl::postRiverRunAnimation3() {
// QPalette tempPalette = groupBoxArray[i]->palette();
// tempPalette.setColor(QPalette::Window, highlight);
// groupBoxArray[i]->setPalette(tempPalette);
actionLabelArray[i]->setText("<p align='center'><b>- Winner -</b></p>");
actionLabelArray[i]->setPixmap(QPixmap(":/actions/resources/graphics/actions/action_winner.png"));
//nicht gewonnene Karten ausblenden
if ( actualHand->getActivePlayersCounter() != 1 && myConfig->readConfigInt("ShowFadeOutCardsAnimation")) {
src/gui/qt/resources.qrc
+11 -1
View File
@@ -1,4 +1,14 @@
<RCC>
<qresource prefix="/actions" >
<file>resources/graphics/actions/action_allin.png</file>
<file>resources/graphics/actions/action_bet.png</file>
<file>resources/graphics/actions/action_call.png</file>
<file>resources/graphics/actions/action_check.png</file>
<file>resources/graphics/actions/action_fold.png</file>
<file>resources/graphics/actions/action_raise.png</file>
<file>resources/graphics/actions/action_set.png</file>
<file>resources/graphics/actions/action_winner.png</file>
</qresource>
<qresource prefix="/cards" >
<file>resources/graphics/cards/0.png</file>
<file>resources/graphics/cards/1.png</file>
@@ -82,6 +92,6 @@
<file>resources/guiv2/playeraction_03.png</file>
<file>resources/guiv2/playeraction_05.png</file>
<file>resources/guiv2/playeraction_07.png</file>
<file>resources/guiv2/table.png</file>
<file>resources/guiv2/table.png</file>
</qresource>
</RCC>
src/gui/qt/resources/graphics/actions/action_allin.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

src/gui/qt/resources/graphics/actions/action_bet.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

src/gui/qt/resources/graphics/actions/action_call.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

src/gui/qt/resources/graphics/actions/action_check.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

src/gui/qt/resources/graphics/actions/action_fold.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

src/gui/qt/resources/graphics/actions/action_raise.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.7 KiB

src/gui/qt/resources/graphics/actions/action_set.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

src/gui/qt/resources/graphics/actions/action_template.xcf
BIN
View File
Binary file not shown.
src/gui/qt/resources/graphics/actions/action_winner.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB