summaryrefslogtreecommitdiff
path: root/src/sound.cpp
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-13 01:16:52 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2005-03-13 01:16:52 +0000
commitab9debf3fa91f3b36c6739f4affbdc187e78113d (patch)
tree4e22c94c0c3fd70c7741e98a7d81d0150ff57fba /src/sound.cpp
parentd0c5ab3fe88e1248f755a764248037960f7bed35 (diff)
downloadmana-client-ab9debf3fa91f3b36c6739f4affbdc187e78113d.tar.gz
mana-client-ab9debf3fa91f3b36c6739f4affbdc187e78113d.tar.bz2
mana-client-ab9debf3fa91f3b36c6739f4affbdc187e78113d.tar.xz
mana-client-ab9debf3fa91f3b36c6739f4affbdc187e78113d.zip
* Moved Being public char *speech to private std::string speech
* Moved Being public PATH_NODE *path to private std::list<PATH_NODE> path * Fixed warping issue which corrupted player (which also applies to respawning) * Got rid of sound error in Setup window
Diffstat (limited to 'src/sound.cpp')
-rw-r--r--src/sound.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/sound.cpp b/src/sound.cpp
index 20530750..6e2c19fe 100644
--- a/src/sound.cpp
+++ b/src/sound.cpp
@@ -30,9 +30,8 @@
void Sound::init(int voices, int mod_voices)
{
- if (isOk == 0) {
- throw("Sound engine cannot be initialized twice!\n");
- }
+ // Don't initialize sound engine twice
+ if (isOk == 0) return;
bgm = NULL;
int audio_rate = 44100;