Remove more commented-out code. Out of sight, out of mind

[lugaru.git] / Source / GameInitDispose.cpp

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index da5516cb1abf2352a270386ba6660681a3770025..8530e37b6b2e5670439ef580197e8bc89f61210c 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,9 +97,6 @@ extern float accountcampaigntime[10];
 extern int accountcampaignchoicesmade[10];
 extern int accountcampaignchoices[10][5000];
 
-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);
-
 void LOG(const std::string &fmt, ...)
 {
     // !!! FIXME: write me.
@@ -876,11 +870,8 @@ void Game::InitGame()
        OPENAL_SetSFXMasterVolume((int)(volume*255));
        loadAllSounds();
 
-       if(musictoggle){
-               PlayStreamEx(stream_music3, samp[stream_music3], 0, true);
-               OPENAL_SetPaused(channels[stream_music3], false);
-               OPENAL_SetVolume(channels[stream_music3], 256);
-       }
+       if(musictoggle)
+         emit_stream_np(stream_music3);
 
        LoadTexture(":Data:Textures:Cursor.png",&cursortexture,0,1);
 
@@ -929,11 +920,6 @@ void Game::LoadStuff()
 
        visibleloading=1;
 
-       /*musicvolume[3]=512;
-       PlaySoundEx( music4, samp[music4], NULL, true);
-       OPENAL_SetPaused(channels[music4], false);
-       OPENAL_SetVolume(channels[music4], 512);
-       */
        loadtime=0;
 
        stillloading=1;
@@ -1263,12 +1249,7 @@ void Game::LoadStuff()
        }
 
        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;