X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameInitDispose.cpp;h=c96eb28c06990fabcf7d0fe831bf5777dc9262ce;hb=089f2f48ecc1c838f303842e17a618c26b43d794;hp=ed1edac3ce8320c059b334963de618eae55734af;hpb=d5ff767196019eeb0001f921365bb1e4060eee5b;p=lugaru.git

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index ed1edac..c96eb28 100644
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -97,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.
@@ -873,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);
 
@@ -1260,12 +1254,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;