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

diff --git a/Source/GameInitDispose.cpp b/Source/GameInitDispose.cpp
index ed1edac..db565c2 100644
--- a/Source/GameInitDispose.cpp
+++ b/Source/GameInitDispose.cpp
@@ -34,13 +34,11 @@ extern float gravity;
 extern Light light;
 extern Skeleton testskeleton;
 extern int numsounds;
-extern int channels[100];
 extern Terrain terrain;
 //extern Sprites sprites;
 extern int kTextureSize;
 extern float texdetail;
 extern float realtexdetail;
-extern float terraindetail;
 extern float volume;
 extern Objects objects;
 extern int detail;
@@ -71,7 +69,6 @@ extern int whichjointendarray[26];
 extern int difficulty;
 extern float tintr,tintg,tintb;
 extern float slomospeed;
-extern char mapname[256];
 extern bool gamestarted;
 
 extern int numdialogues;
@@ -97,9 +94,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.
@@ -819,20 +813,14 @@ void Game::InitGame()
 
 	if(detail==2){
 		texdetail=1;
-		terraindetail=1;
 	}
 	if(detail==1){
 		texdetail=2;
-		terraindetail=1;
 	}
 	if(detail==0){
 		texdetail=4;
-		terraindetail=1;
-		//terraindetail=2;
 	}
 
-	memset(channels, 0xff, sizeof(channels));
-
 	LOG("Initializing sound system...");
 
     int output = -1;
@@ -873,11 +861,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);
 
@@ -926,11 +911,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;
@@ -969,16 +949,12 @@ void Game::LoadStuff()
 
 	if(detail==2){
 		texdetail=1;
-		terraindetail=1;
 	}
 	if(detail==1){
 		texdetail=2;
-		terraindetail=1;
 	}
 	if(detail==0){
 		texdetail=4;
-		terraindetail=1;
-		//terraindetail=2;
 	}
 
 	realtexdetail=texdetail;
@@ -1126,7 +1102,7 @@ void Game::LoadStuff()
 	gravity=-10;
 
 	texscale=.2/megascale/viewdistdetail;
-	terrain.scale=3*megascale*terraindetail*viewdistdetail;
+	terrain.scale=3*megascale*viewdistdetail;
 
 	viewer.x=terrain.size/2*terrain.scale;
 	viewer.z=terrain.size/2*terrain.scale;
@@ -1260,12 +1236,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;