--- 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)
-{
-
-}
--- 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
--- 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 <QTableWidget>
#include <QAction>
#include <QMenu>
+#include <QSound>
#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) :
Binary file share/hedgewars/Data/Sounds/voices/Default/Illgetyou.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Default/Incoming.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Default/Stupid.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Pirate/Coward.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Pirate/Enemydown.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Robot/Reinforcements.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Robot/Yessir.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Singer/Illgetyou.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Singer/Revenge.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Surfer/Illgetyou.wav has changed
Binary file share/hedgewars/Data/Sounds/voices/Surfer/Yessir.wav has changed