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

All sounds are now only played if sound output is on (even the ping in network game). Audio is only initialized if it is enabled. Fixed double sounds in network games. Simplified fading out cards on fold.

Browse Source
This commit is contained in:
lotodore
2007-06-16 09:48:23 +00:00
parent af9f799b51
commit 5c63a12104
9 changed files with 26 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/qt/mainwindow/mainwindowimpl.cpp
+13 -23
View File
@@ -629,9 +629,6 @@ mainWindowImpl::mainWindowImpl(ConfigFile *c, QMainWindow *parent)
connect(this, SIGNAL(signalNetServerPlayerJoined(QString)), myStartNetworkGameDialog, SLOT(addConnectedPlayer(QString)));
connect(this, SIGNAL(signalNetServerPlayerLeft(QString)), myStartNetworkGameDialog, SLOT(removePlayer(QString)));
connect(this, SIGNAL(signalFadeOutHumanPlayerCards()), this, SLOT( fadeOutHumanPlayerCards()));
//Sound
mySDLPlayer = new SDLPlayer(myConfig);
@@ -841,8 +838,9 @@ void mainWindowImpl::callSettingsDialog() {
}
}
}
//Audio Clean?
if (myConfig->readConfigInt("PlaySoundEffects") == 0) { mySDLPlayer->audioDone(); }
// Re-init audio.
mySDLPlayer->closeAudio();
mySDLPlayer->initAudio();
}
}
@@ -1078,13 +1076,16 @@ void mainWindowImpl::refreshAction(int playerID, int playerAction) {
actionLabelArray[playerID]->setPixmap(QPixmap(":/actions/resources/graphics/actions/action_"+actionArray[playerAction]+".png"));
//play sounds if exist
if(myConfig->readConfigInt("PlaySoundEffects")) mySDLPlayer->playSound(actionArray[playerAction].toStdString(), playerID);
mySDLPlayer->playSound(actionArray[playerAction].toStdString(), playerID);
}
if (playerAction == 1) {
// groupBoxArray[i]->setDisabled(TRUE);
if(playerID != 0) {
if (playerAction == 1) { // FOLD
if (playerID == 0) {
holeCardsArray[0][0]->startFadeOut(10);
holeCardsArray[0][1]->startFadeOut(10);
}
else {
holeCardsArray[playerID][0]->setPixmap(onePix, FALSE);
holeCardsArray[playerID][1]->setPixmap(onePix, FALSE);
}
@@ -1584,12 +1585,6 @@ void mainWindowImpl::myFold(){
currentHand->getPlayerArray()[0]->setMyAction(1);
currentHand->getPlayerArray()[0]->setMyTurn(0);
if (!mySession->isNetworkClientRunning())
{
holeCardsArray[0][0]->startFadeOut(10);
holeCardsArray[0][1]->startFadeOut(10);
}
//set that i was the last active player. need this for unhighlighting groupbox
currentHand->setLastPlayersTurn(0);
@@ -1809,7 +1804,8 @@ void mainWindowImpl::myActionDone() {
// TODO: Should not call in networking game.
disableMyButtons();
nextPlayerAnimation();
if (!mySession->isNetworkClientRunning())
nextPlayerAnimation();
}
void mainWindowImpl::nextPlayerAnimation() {
@@ -2646,12 +2642,6 @@ void mainWindowImpl::networkGameModification() {
}
void mainWindowImpl::fadeOutHumanPlayerCards() {
holeCardsArray[0][0]->startFadeOut(10);
holeCardsArray[0][1]->startFadeOut(10);
}
void mainWindowImpl::closeEvent(QCloseEvent *event) { quitPokerTH(); }
void mainWindowImpl::quitPokerTH() {