# HG changeset patch # User unc0rr # Date 1232288744 0 # Node ID ad7a7fd14d36b9ec4486baf5cc4b3eedbe0ca28d # Parent 6b16b0b66f55fdf40ae686db1e1cc9620988c063 Now voicepack checking button should work (but it doesn't for me) diff -r 6b16b0b66f55 -r ad7a7fd14d36 QTfrontend/SDLs.cpp --- a/QTfrontend/SDLs.cpp Sun Jan 18 14:21:13 2009 +0000 +++ b/QTfrontend/SDLs.cpp Sun Jan 18 14:25:44 2009 +0000 @@ -69,8 +69,3 @@ { Mix_FadeOutMusic(2000); } - -void SDLInteraction::PlaySound(const QString & filename) -{ - -} diff -r 6b16b0b66f55 -r ad7a7fd14d36 QTfrontend/SDLs.h --- a/QTfrontend/SDLs.h Sun Jan 18 14:21:13 2009 +0000 +++ b/QTfrontend/SDLs.h Sun Jan 18 14:25:44 2009 +0000 @@ -37,7 +37,6 @@ QStringList getResolutions() const; void StartMusic(); void StopMusic(); - void PlaySound(const QString & filename); }; #endif diff -r 6b16b0b66f55 -r ad7a7fd14d36 QTfrontend/pages.cpp --- a/QTfrontend/pages.cpp Sun Jan 18 14:21:13 2009 +0000 +++ b/QTfrontend/pages.cpp Sun Jan 18 14:25:44 2009 +0000 @@ -37,6 +37,7 @@ #include #include #include +#include #include "pages.h" #include "sdlkeys.h" @@ -270,9 +271,9 @@ tmpdir.cd(datadir->absolutePath()); tmpdir.cd("Sounds/voices"); tmpdir.cd(CBVoicepack->currentText()); - QStringList list = tmpdir.entryList(QStringList() << "*.ogg", QDir::Files); + QStringList list = tmpdir.entryList(QStringList() << "*.wav", QDir::Files); if (list.size()) - ;//QSound::play(tmpdir.absolutePath() + list[rand() % list.size()]); + QSound::play(tmpdir.absolutePath() + "/" + list[rand() % list.size()]); } PageMultiplayer::PageMultiplayer(QWidget* parent) : diff -r 6b16b0b66f55 -r ad7a7fd14d36 share/hedgewars/Data/Sounds/voices/Default/Illgetyou.wav Binary file share/hedgewars/Data/Sounds/voices/Default/Illgetyou.wav has changed diff -r 6b16b0b66f55 -r ad7a7fd14d36 share/hedgewars/Data/Sounds/voices/Default/Incoming.wav Binary file share/hedgewars/Data/Sounds/voices/Default/Incoming.wav has changed diff -r 6b16b0b66f55 -r ad7a7fd14d36 share/hedgewars/Data/Sounds/voices/Default/Stupid.wav Binary file share/hedgewars/Data/Sounds/voices/Default/Stupid.wav has changed diff -r 6b16b0b66f55 -r ad7a7fd14d36 share/hedgewars/Data/Sounds/voices/Pirate/Coward.wav Binary file share/hedgewars/Data/Sounds/voices/Pirate/Coward.wav has changed diff -r 6b16b0b66f55 -r ad7a7fd14d36 share/hedgewars/Data/Sounds/voices/Pirate/Enemydown.wav Binary file share/hedgewars/Data/Sounds/voices/Pirate/Enemydown.wav has changed diff -r 6b16b0b66f55 -r ad7a7fd14d36 share/hedgewars/Data/Sounds/voices/Robot/Reinforcements.wav Binary file share/hedgewars/Data/Sounds/voices/Robot/Reinforcements.wav has changed diff -r 6b16b0b66f55 -r ad7a7fd14d36 share/hedgewars/Data/Sounds/voices/Robot/Yessir.wav Binary file share/hedgewars/Data/Sounds/voices/Robot/Yessir.wav has changed diff -r 6b16b0b66f55 -r ad7a7fd14d36 share/hedgewars/Data/Sounds/voices/Singer/Illgetyou.wav Binary file share/hedgewars/Data/Sounds/voices/Singer/Illgetyou.wav has changed diff -r 6b16b0b66f55 -r ad7a7fd14d36 share/hedgewars/Data/Sounds/voices/Singer/Revenge.wav Binary file share/hedgewars/Data/Sounds/voices/Singer/Revenge.wav has changed diff -r 6b16b0b66f55 -r ad7a7fd14d36 share/hedgewars/Data/Sounds/voices/Surfer/Illgetyou.wav Binary file share/hedgewars/Data/Sounds/voices/Surfer/Illgetyou.wav has changed diff -r 6b16b0b66f55 -r ad7a7fd14d36 share/hedgewars/Data/Sounds/voices/Surfer/Yessir.wav Binary file share/hedgewars/Data/Sounds/voices/Surfer/Yessir.wav has changed