Cleanup sound emission

[lugaru.git] / Source / GameInitDispose.cpp

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index e7889a4d5cac70e830513c4193769a74488726e4..a2f93b98502158c19c4f536631f8192c48d22f9e 100644 (file)
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -51,9 +51,6 @@ extern bool ismotionblur;
 extern bool trilinear;
 extern bool osx;
 extern bool musictoggle;
-extern Weapons weapons;
-extern Person player[maxplayers];
-extern int numplayers;
 extern int environment;
 extern bool ambientsound;
 extern float multiplier;
@@ -100,8 +97,6 @@ extern float accountcampaigntime[10];
 extern int accountcampaignchoicesmade[10];
 extern int accountcampaignchoices[10][5000];
 
-extern OPENAL_STREAM * strm[20];
-
 extern "C"     void PlaySoundEx(int channel, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused);
 extern "C" void PlayStreamEx(int chan, OPENAL_STREAM *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused);
 
@@ -141,19 +136,12 @@ void Game::Dispose()
 // this is causing problems on Linux, but we'll force an _exit() a little
 //  later in the shutdown process.  --ryan.
 #if !PLATFORM_LINUX
-#define streamcount 20
-#define samplecount 100
 
-       for (i=0; i < samplecount; ++i)
+       for (i=0; i < sounds_count; ++i)
        {
                OPENAL_Sample_Free(samp[i]);
        }
 
-       for (i=0; i < streamcount; ++i)
-       {
-               OPENAL_Stream_Close(strm[i]);
-       }
-
        OPENAL_Close();
        if (texture.data)
        {
@@ -164,20 +152,6 @@ void Game::Dispose()
 }
 
 
-void Game::LoadSounds()
-{
-       LOGFUNC;
-
-       LOG(std::string("Loading sounds..."));
-
-       OPENAL_3D_SetDopplerFactor(0);
-
-       OPENAL_SetSFXMasterVolume((int)(volume*255));
-
-       if(visibleloading){LoadingScreen(); loadscreencolor=5;}
-       loadAllSounds();
-}
-
 void Game::LoadTexture(const char *fileName, GLuint *textureid,int mipmap, bool hasalpha)
 {
        GLuint          type;
@@ -858,10 +832,6 @@ void Game::InitGame()
        }
 
        memset(channels, 0xff, sizeof(channels));
-       for (int it = 0; it < 20; ++it)
-       {
-               strm[it] = NULL;
-       }
 
        LOG("Initializing sound system...");
 
@@ -901,58 +871,14 @@ void Game::InitGame()
     #endif
 
        OPENAL_SetSFXMasterVolume((int)(volume*255));
-
-       strm[stream_music3] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:music3.mp3"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=0;}
-       OPENAL_Stream_SetMode(strm[stream_music3], OPENAL_LOOP_NORMAL);
+       loadAllSounds();
 
        if(musictoggle){
-//             PlaySoundEx( stream_music3, strm[stream_music3], NULL, true);
-               PlayStreamEx(stream_music3, strm[stream_music3], 0, true);
+               PlayStreamEx(stream_music3, samp[stream_music3], 0, true);
                OPENAL_SetPaused(channels[stream_music3], false);
                OPENAL_SetVolume(channels[stream_music3], 256);
        }
 
-       FadeLoadingScreen(20);
-
-       if(ambientsound){
-               strm[stream_wind] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:wind.mp3"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=5;}
-               OPENAL_Stream_SetMode(strm[stream_wind], OPENAL_LOOP_NORMAL);
-
-               FadeLoadingScreen(30);
-
-               strm[stream_desertambient] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:desertambient.mp3"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=5;}
-               OPENAL_Stream_SetMode(strm[stream_desertambient], OPENAL_LOOP_NORMAL);
-       }
-
-       FadeLoadingScreen(40);
-
-       strm[stream_firesound] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:fire.ogg"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=5;}
-       OPENAL_Stream_SetMode(strm[stream_firesound], OPENAL_LOOP_NORMAL);
-
-       FadeLoadingScreen(50);
-
-       //if(musictoggle){
-       strm[stream_music1grass] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:music1grass.mp3"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=1;}
-       OPENAL_Stream_SetMode(strm[stream_music1grass], OPENAL_LOOP_NORMAL);
-
-       strm[stream_music1snow] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:music1snow.mp3"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=2;}
-       OPENAL_Stream_SetMode(strm[stream_music1snow], OPENAL_LOOP_NORMAL);
-
-       FadeLoadingScreen(60);
-
-       strm[stream_music1desert] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:music1desert.mp3"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=3;}
-       OPENAL_Stream_SetMode(strm[stream_music1desert], OPENAL_LOOP_NORMAL);
-
-       FadeLoadingScreen(80);
-       strm[stream_music2] = OPENAL_Sample_Load(OPENAL_FREE, ConvertFileName(":Data:Sounds:music2.ogg"), OPENAL_2D, 0, 0); if(visibleloading){LoadingScreen(); loadscreencolor=4;}
-       OPENAL_Stream_SetMode(strm[stream_music2], OPENAL_LOOP_NORMAL);
-
-       //}
-
-
-       FadeLoadingScreen(90);
-
-
        LoadTexture(":Data:Textures:Cursor.png",&cursortexture,0,1);
 
        LoadTexture(":Data:Textures:MapCircle.png",&Mapcircletexture,0,1);
@@ -1332,21 +1258,9 @@ void Game::LoadStuff()
 
                glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 0, 0, kTextureSize, kTextureSize, 0);
        }
-       //}
 
-       LoadSounds();
-
-       /*PlaySoundEx( consolesuccesssound, samp[consolesuccesssound], NULL, true);
-       OPENAL_SetVolume(channels[consolesuccesssound], 256);
-       OPENAL_SetPaused(channels[consolesuccesssound], false);
-       */
        if(targetlevel!=7){
-               float gLoc[3]={0,0,0};
-               float vel[3]={0,0,0};
-               PlaySoundEx( fireendsound, samp[fireendsound], NULL, true);
-               OPENAL_3D_SetAttributes(channels[fireendsound], gLoc, vel);
-               OPENAL_SetVolume(channels[fireendsound], 256);
-               OPENAL_SetPaused(channels[fireendsound], false);
+               emit_sound_at(fireendsound);
        }
 
        stillloading=0;