Fixed warnings, removed unused attributes, broken audio output setting, and so on

[lugaru.git] / Source / Audio / Sounds.cpp

diff --git a/Source/Audio/Sounds.cpp b/Source/Audio/Sounds.cpp
index 2e47da014fc548fcfd062f0eea3844733b43b512..94989a1f1a9167e4e4feca956bfb0092b50a17b2 100644 (file)
--- a/Source/Audio/Sounds.cpp
+++ b/Source/Audio/Sounds.cpp
@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
 along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "Audio/openal_wrapper.h"
-#include "Audio/Sounds.h"
-#include "Math/Quaternions.h"
-#include "Utils/Folders.h"
+#include "Audio/Sounds.hpp"
+
+#include "Audio/openal_wrapper.hpp"
+#include "Utils/Folders.hpp"
 
 struct OPENAL_SAMPLE *samp[sounds_count];
 
@@ -85,7 +85,7 @@ void addEnvSound(XYZ coords, float vol, float life)
 void emit_sound_at(int soundid, const XYZ &pos, float vol)
 {
     PlaySoundEx (soundid, samp[soundid], NULL, true);
-    OPENAL_3D_SetAttributes_ (channels[soundid], pos, NULL);
+    OPENAL_3D_SetAttributes_ (channels[soundid], pos);
     OPENAL_SetVolume (channels[soundid], vol);
     OPENAL_SetPaused (channels[soundid], false);
 }
@@ -100,7 +100,7 @@ void emit_sound_np(int soundid, float vol)
 void emit_stream_at(int soundid, const XYZ &pos, float vol)
 {
     PlayStreamEx (soundid, samp[soundid], NULL, true);
-    OPENAL_3D_SetAttributes_ (channels[soundid], pos, NULL);
+    OPENAL_3D_SetAttributes_ (channels[soundid], pos);
     OPENAL_SetVolume (channels[soundid], vol);
     OPENAL_SetPaused (channels[soundid], false);
 }