More PlaySoundEx eradication

[lugaru.git] / Source / Game.cpp

diff --git a/Source/Game.cpp b/Source/Game.cpp
index 524009d2500b504846f927c4223147d5fba8fe47..357427fd3a8ee1f342fbd0dc5a55dd2517adb447 100644 (file)
--- a/Source/Game.cpp
+++ b/Source/Game.cpp
@@ -3,9 +3,7 @@
 #include "SDL_thread.h"
 
 extern int mainmenu;
-extern OPENAL_SAMPLE *samp[100];
 extern int channels[100];
-extern "C" void PlaySoundEx(int channel, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused);
 
 
 
@@ -219,14 +217,7 @@ typedef struct {
 } params_thread;
 
 void Game::fireSound(int sound) {
-       float gLoc[3]={0,0,0};
-       float vel[3]={0,0,0};
-       OPENAL_Sample_SetMinMaxDistance(samp[sound], 9999.0f, 99999.0f);
-       PlaySoundEx( sound, samp[sound], NULL, true);
-       OPENAL_3D_SetAttributes(channels[sound], gLoc, vel);
-       OPENAL_SetVolume(channels[sound], 256);
-       OPENAL_SetPaused(channels[sound], false);
-       OPENAL_Sample_SetMinMaxDistance(samp[sound], 8.0f, 2000.0f);
+       emit_sound_at(sound);
 }
 
 void Game::inputText(char* str, int* charselected, int* nb_chars) {
@@ -355,3 +346,12 @@ int Game::thread(void *data) {
         (pt->game->*(pt->method))();
     }
 }
+
+void Game::DrawGL() {
+       if ( stereomode == stereoNone ) {
+               DrawGLScene(stereoCenter);
+       } else {
+               DrawGLScene(stereoLeft);
+               DrawGLScene(stereoRight);
+       }
+}