X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FGameTick.cpp;h=55fbb962a89ff8c10767c532f034cb504a61a236;hb=7a0b90b30144f63105f6efd8f0d969862934b046;hp=e9c2461999a92aa3a01c2bba8844f9b2313e1b3f;hpb=5c8be15962d6b02d7fdfdb16acc10f55267bea0f;p=lugaru.git

diff --git a/Source/GameTick.cpp b/Source/GameTick.cpp
index e9c2461..55fbb96 100644
--- a/Source/GameTick.cpp
+++ b/Source/GameTick.cpp
@@ -33,6 +33,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Settings.h"
 #include "Input.h"
 #include "Animation.h"
+#include "Awards.h"
 
 using namespace std;
 
@@ -48,7 +49,6 @@ extern XYZ viewer;
 extern int environment;
 extern float texscale;
 extern Terrain terrain;
-extern int channels[100];
 extern int kTextureSize;
 extern float screenwidth,screenheight;
 extern float gravity;
@@ -70,9 +70,6 @@ extern float blackout;
 extern bool cellophane;
 extern bool musictoggle;
 extern int difficulty;
-extern Weapons weapons;
-extern Person player[maxplayers];
-extern int numplayers;
 extern int bloodtoggle;
 extern bool invertmouse;
 extern float windvar;
@@ -114,14 +111,7 @@ extern bool decals;
 extern bool vblsync;
 extern bool immediate;
 extern bool velocityblur;
-extern int bonus;
-extern int oldbonus;
-extern float bonusvalue;
-extern float bonustotal;
-extern float bonustime;
-extern float startbonustotal;
 extern float tintr,tintg,tintb;
-extern float bonusnum[100];
 extern bool skyboxtexture;
 extern float skyboxr;
 extern float skyboxg;
@@ -143,7 +133,6 @@ extern bool reversaltrain;
 extern bool canattack;
 extern bool cananger;
 extern float damagedealt;
-extern float damagetaken;
 extern int maptype;
 extern int editoractive;
 extern int editorpathtype;
@@ -168,23 +157,6 @@ extern int hostile;
 extern bool stillloading;
 extern bool winfreeze;
 
-extern int numfalls;
-extern int numflipfail;
-extern int numseen;
-extern int numstaffattack;
-extern int numswordattack;
-extern int numknifeattack;
-extern int numunarmedattack;
-extern int numescaped;
-extern int numflipped;
-extern int numwallflipped;
-extern int numthrowkill;
-extern int numafterkill;
-extern int numreversals;
-extern int numattacks;
-extern int maxalarmed;
-extern int numresponded;
-
 extern int numdialogues;
 extern int numdialogueboxes[max_dialogues];
 extern int dialoguetype[max_dialogues];
@@ -241,11 +213,6 @@ static bool stripfx(const char *str, const char *pfx)
   return !strncasecmp(str, pfx, strlen(pfx));
 }
 
-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);
-
-
 static const char *cmd_names[] = {
 #define DECLARE_COMMAND(cmd) #cmd " ",
 #include "ConsoleCmds.h"
@@ -638,7 +605,7 @@ static void set_clothes(int pnum, Game *game, const char *args)
   if (!game->AddClothes(buf,0,1,&player[pnum].skeleton.skinText[pnum],&player[pnum].skeleton.skinsize))
     return;
 
-  player[pnum].DoMipmaps(5,0,0,player[pnum].skeleton.skinsize,player[pnum].skeleton.skinsize);
+  player[pnum].DoMipmaps();
   strcpy(player[pnum].clothes[player[pnum].numclothes],buf);
   player[pnum].clothestintr[player[pnum].numclothes]=tintr;
   player[pnum].clothestintg[player[pnum].numclothes]=tintg;
@@ -1016,20 +983,12 @@ static void ch_play(Game *game, const char *args)
   directing=0;
   indialogue=0;
 
-  float gLoc[3];
-  float vel[3];
   XYZ temppos;
   temppos=player[participantfocus[whichdialogue][indialogue]].coords;
   temppos=temppos-viewer;
   Normalise(&temppos);
   temppos+=viewer;
 
-  gLoc[0]=temppos.x;
-  gLoc[1]=temppos.y;
-  gLoc[2]=temppos.z;
-  vel[0]=0;
-  vel[1]=0;
-  vel[2]=0;
   int whichsoundplay;
   whichsoundplay=rabbitchitter;
   if(dialogueboxsound[whichdialogue][indialogue]==2)whichsoundplay=rabbitchitter2;
@@ -1051,10 +1010,7 @@ static void ch_play(Game *game, const char *args)
   if(dialogueboxsound[whichdialogue][indialogue]==-2)whichsoundplay=firestartsound;
   if(dialogueboxsound[whichdialogue][indialogue]==-3)whichsoundplay=consolesuccesssound;
   if(dialogueboxsound[whichdialogue][indialogue]==-4)whichsoundplay=consolefailsound;
-  PlaySoundEx( whichsoundplay, samp[whichsoundplay], NULL, true);
-  OPENAL_3D_SetAttributes(channels[whichsoundplay], gLoc, vel);
-  OPENAL_SetVolume(channels[whichsoundplay], 256);
-  OPENAL_SetPaused(channels[whichsoundplay], false);
+  emit_sound_at(whichsoundplay, temppos);
 }
 
 static void ch_mapkilleveryone(Game *game, const char *args)
@@ -1143,18 +1099,7 @@ static void cmd_dispatch(Game *game, const char *cmd)
 	cmd_handlers[i](game, cmd + strlen(cmd_names[i]));
 	break;
       }
-  if (i < n_cmds)
-    {
-      PlaySoundEx(consolesuccesssound, samp[consolesuccesssound], NULL, true);
-      OPENAL_SetVolume(channels[consolesuccesssound], 256);
-      OPENAL_SetPaused(channels[consolesuccesssound], false);
-    }
-  else
-    {
-      PlaySoundEx(consolefailsound, samp[consolefailsound], NULL, true);
-      OPENAL_SetVolume(channels[consolefailsound], 256);
-      OPENAL_SetPaused(channels[consolefailsound], false);
-    }
+  emit_sound_np(i < n_cmds ? consolesuccesssound : consolefailsound);
 }
 
 /********************> Tick() <*****/
@@ -1369,29 +1314,19 @@ void	Game::Setenvironment(int which)
 
 	float temptexdetail;
 	environment=which;
-/*
-	OPENAL_SetPaused(channels[music1snow], true);
-	OPENAL_SetPaused(channels[music1grass], true);
-	OPENAL_SetPaused(channels[music1desert], true);
-	OPENAL_SetPaused(channels[wind], true);
-	OPENAL_SetPaused(channels[desertambient], true);
-*/
-	OPENAL_SetPaused(channels[stream_music1snow], true);
-	OPENAL_SetPaused(channels[stream_music1grass], true);
-	OPENAL_SetPaused(channels[stream_music1desert], true);
-	OPENAL_SetPaused(channels[stream_wind], true);
-	OPENAL_SetPaused(channels[stream_desertambient], true);
+
+	pause_sound(stream_music1snow);
+	pause_sound(stream_music1grass);
+	pause_sound(stream_music1desert);
+	pause_sound(stream_wind);
+	pause_sound(stream_desertambient);
 
 
 	if(environment==snowyenvironment){
 		windvector=0;
 		windvector.z=3;
-		if(ambientsound){
-			//PlaySoundEx( wind, samp[wind], NULL, true);
-			PlayStreamEx(stream_wind, strm[stream_wind], 0, true);
-			OPENAL_SetPaused(channels[stream_wind], false);
-			OPENAL_SetVolume(channels[stream_wind], 256);
-		}
+		if(ambientsound)
+		  emit_stream_np(stream_wind);
 
 		LoadTexture(":Data:Textures:snowtree.png",&objects.treetextureptr,0,1);
 		LoadTexture(":Data:Textures:bushsnow.png",&objects.bushtextureptr,0,1);
@@ -1437,12 +1372,8 @@ void	Game::Setenvironment(int which)
 		LoadTexture(":Data:Textures:desertbox.jpg",&objects.boxtextureptr,1,0);
 
 
-		if(ambientsound){
-			//PlaySoundEx( desertambient, samp[desertambient], NULL, true);
-			PlayStreamEx( stream_desertambient, strm[stream_desertambient], NULL, true);
-			OPENAL_SetPaused(channels[stream_desertambient], false);
-			OPENAL_SetVolume(channels[stream_desertambient], 256);
-		}
+		if(ambientsound)
+		  emit_stream_np(stream_desertambient);
 
 		footstepsound = footstepsn1;
 		footstepsound2 = footstepsn2;
@@ -1481,11 +1412,8 @@ void	Game::Setenvironment(int which)
 		LoadTexture(":Data:Textures:boulder.jpg",&objects.rocktextureptr,1,0);
 		LoadTexture(":Data:Textures:grassbox.jpg",&objects.boxtextureptr,1,0);
 
-		if(ambientsound){
-			PlayStreamEx( stream_wind, strm[stream_wind], NULL, true);
-			OPENAL_SetPaused(channels[stream_wind], false);
-			OPENAL_SetVolume(channels[stream_wind], 100);
-		}
+		if(ambientsound)
+		  emit_stream_np(stream_wind, 100.);
 
 		footstepsound = footstepgr1;
 		footstepsound2 = footstepgr2;
@@ -1582,8 +1510,8 @@ void	Game::Loadlevel(char *name){
 	if(!firstload){
 		oldlevel=50;
 	}
-	OPENAL_SetPaused(channels[whooshsound], true);
-	OPENAL_SetPaused(channels[stream_firesound], true);
+	pause_sound(whooshsound);
+	pause_sound(stream_firesound);
 
 	// Change the map filename into something that is os specific
 	char *FixedFN = ConvertFileName(name);
@@ -1593,7 +1521,7 @@ void	Game::Loadlevel(char *name){
 	tfile=fopen( FixedFN, "rb" );
 	if(tfile)
 	{
-		OPENAL_SetPaused(channels[stream_firesound], true);
+		pause_sound(stream_firesound);
 
 
 		scoreadded=0;
@@ -1664,9 +1592,7 @@ void	Game::Loadlevel(char *name){
 		changedelay=0;
 		if(console)
 		{
-			PlaySoundEx( consolesuccesssound, samp[consolesuccesssound], NULL, true);
-			OPENAL_SetVolume(channels[consolesuccesssound], 256);
-			OPENAL_SetPaused(channels[consolesuccesssound], false);
+			emit_sound_np(consolesuccesssound);
 			freeze=0;
 			console=0;
 		}
@@ -2099,7 +2025,7 @@ void	Game::Loadlevel(char *name){
 					tintb=player[i].clothestintb[j];
 					AddClothes((char *)player[i].clothes[j],0,1,&player[i].skeleton.skinText[0],&player[i].skeleton.skinsize);
 				}
-				player[i].DoMipmaps(5,0,0,player[i].skeleton.skinsize,player[i].skeleton.skinsize);
+				player[i].DoMipmaps();
 			}
 
 			player[i].currentanimation=bounceidleanim;
@@ -2270,33 +2196,17 @@ void	Game::Loadlevel(char *name){
 		if(environment==snowyenvironment)
 		{
 			if(ambientsound)
-			{
-				PlayStreamEx(stream_wind, strm[stream_wind], NULL, true);
-				OPENAL_SetPaused(channels[stream_wind], false);
-				OPENAL_SetVolume(channels[stream_wind], 256);
-			}
+			  emit_stream_np(stream_wind);
 		}
 		else if(environment==desertenvironment)
 		{
 			if(ambientsound)
-			{
-				//PlaySoundEx(desertambient,
-				//	samp[desertambient], NULL, true);
-				PlayStreamEx(stream_desertambient,
-					strm[stream_desertambient], NULL, true);
-				OPENAL_SetPaused(channels[stream_desertambient], false);
-				OPENAL_SetVolume(channels[stream_desertambient], 256);
-			}
+			  emit_stream_np(stream_desertambient);
 		}
 		else if(environment==grassyenvironment)
 		{
 			if(ambientsound)
-			{
-				//PlaySoundEx(wind, samp[wind], NULL, true);
-				PlayStreamEx(stream_wind, strm[stream_wind], NULL, true);
-				OPENAL_SetPaused(channels[stream_wind], false);
-				OPENAL_SetVolume(channels[stream_wind], 100);
-			}
+			  emit_stream_np(stream_wind, 100.);
 		}
 		oldmusicvolume[0]=0;
 		oldmusicvolume[1]=0;
@@ -2391,15 +2301,13 @@ void	Game::Tick()
 				if(mainmenu&&musictoggle){
 					if(mainmenu==1||mainmenu==2||mainmenu==100){
 						OPENAL_SetFrequency(OPENAL_ALL, 0.001);
-						PlayStreamEx( stream_music3, strm[stream_music3], NULL, true);
-						OPENAL_SetPaused(channels[stream_music3], false);
-						OPENAL_SetVolume(channels[stream_music3], 256);
-						OPENAL_SetPaused(channels[music1], true);
+						emit_stream_np(stream_music3);
+						pause_sound(music1);
 					}
 				}
 				if(!mainmenu){
-					OPENAL_SetPaused(channels[stream_music3], true);
-					OPENAL_SetPaused(channels[music1], false);
+					pause_sound(stream_music3);
+					resume_stream(music1);
 				}
 			}
 			if(mainmenu==3){
@@ -2444,9 +2352,7 @@ void	Game::Tick()
 	if(Input::isKeyDown(SDLK_TAB)&&!minimaptogglekeydown&&tutoriallevel){
 		if(tutorialstage!=51)
 			tutorialstagetime=tutorialmaxtime;
-		PlaySoundEx( consolefailsound, samp[consolefailsound], NULL, true);
-		OPENAL_SetVolume(channels[consolefailsound], 128);
-		OPENAL_SetPaused(channels[consolefailsound], false);
+		emit_sound_np(consolefailsound, 128.);
 		minimaptogglekeydown=1;
 	}
 	if(!Input::isKeyDown(SDLK_TAB)){
@@ -2474,8 +2380,8 @@ void	Game::Tick()
 				{
 					//resume
 					mainmenu=0;
-					OPENAL_SetPaused(channels[stream_music3], true);
-					OPENAL_SetPaused(channels[music1], false);
+					pause_sound(stream_music3);
+					resume_stream(music1);
 				}
 			}
 
@@ -2504,7 +2410,7 @@ void	Game::Tick()
 				if(!gameon){
 					//quit
 					tryquit=1;
-					OPENAL_SetPaused(channels[stream_music3], true);
+					pause_sound(stream_music3);
 				}
 				else{
 					//end game
@@ -2587,9 +2493,9 @@ void	Game::Tick()
 				musictoggle=1-musictoggle;
 
 				if(!musictoggle){
-					OPENAL_SetPaused(channels[music1], true);
-					OPENAL_SetPaused(channels[stream_music2], true);
-					OPENAL_SetPaused(channels[stream_music3], true);
+					pause_sound(music1);
+					pause_sound(stream_music2);
+					pause_sound(stream_music3);
 
 					for(i=0;i<4;i++){
 						oldmusicvolume[i]=0;
@@ -2597,11 +2503,8 @@ void	Game::Tick()
 					}
 				}
 
-				if(musictoggle){
-					PlayStreamEx( stream_music3, strm[stream_music3], NULL, true);
-					OPENAL_SetPaused(channels[stream_music3], false);
-					OPENAL_SetVolume(channels[stream_music3], 256);
-				}
+				if(musictoggle)
+				  emit_stream_np(stream_music3);
 			}
 			if(Input::Button()&&!oldbutton&&selected==9){
 				invertmouse=1-invertmouse;
@@ -2699,7 +2602,7 @@ void	Game::Tick()
 
 				mainmenu=0;
 				gameon=1;
-				OPENAL_SetPaused(channels[stream_music3], true);
+				pause_sound(stream_music3);
 			}
 			if(Input::Button()&&!oldbutton&&(selected-7>=accountactive->getCampaignChoicesMade())){
 				fireSound();
@@ -2736,7 +2639,7 @@ void	Game::Tick()
 				campaign=1;
 				mainmenu=0;
 				gameon=1;
-				OPENAL_SetPaused(channels[stream_music3], true);
+				pause_sound(stream_music3);
 			}
 			if(Input::Button()&&!oldbutton&&selected==4){
 				fireSound();
@@ -2768,7 +2671,7 @@ void	Game::Tick()
 				mainmenu=9;
 			}
 		}
-		if(mainmenu==9){
+		else if(mainmenu==9){
 			if(Input::Button()&&!oldbutton&&selected<numchallengelevels&&selected>=0&&selected<=accountactive->getProgress()){
 				fireSound();
 
@@ -2788,7 +2691,7 @@ void	Game::Tick()
 
 				mainmenu=0;
 				gameon=1;
-				OPENAL_SetPaused(channels[stream_music3], true);
+				pause_sound(stream_music3);
 			}
 			if(Input::Button()&&!oldbutton&&selected==numchallengelevels){
 				fireSound();
@@ -3068,9 +2971,7 @@ void	Game::Tick()
 		static int oldwinfreeze;
 		if(winfreeze&&!oldwinfreeze){
 			OPENAL_SetFrequency(OPENAL_ALL, 0.001);
-			PlaySoundEx( consolesuccesssound, samp[consolesuccesssound], NULL, true);
-			OPENAL_SetVolume(channels[consolesuccesssound], 256);
-			OPENAL_SetPaused(channels[consolesuccesssound], false);
+			emit_sound_np(consolesuccesssound);
 		}
 		if(winfreeze==0)oldwinfreeze=winfreeze;
 		else oldwinfreeze++;
@@ -3142,19 +3043,12 @@ void	Game::Tick()
 								dialoguetime=0;
 								dialoguegonethrough[i]++;
 								if(dialogueboxsound[whichdialogue][indialogue]!=0){
-									static float gLoc[3];
-									static float vel[3];
 									XYZ temppos;
 									temppos=player[participantfocus[whichdialogue][indialogue]].coords;
 									temppos=temppos-viewer;
 									Normalise(&temppos);
 									temppos+=viewer;
 
-									gLoc[0]=temppos.x;
-									gLoc[1]=temppos.y;
-									gLoc[2]=temppos.z;vel[0]=0;
-									vel[1]=0;
-									vel[2]=0;
 									int whichsoundplay;
 									if(dialogueboxsound[whichdialogue][indialogue]==1)whichsoundplay=rabbitchitter;
 									if(dialogueboxsound[whichdialogue][indialogue]==2)whichsoundplay=rabbitchitter2;
@@ -3176,10 +3070,7 @@ void	Game::Tick()
 									if(dialogueboxsound[whichdialogue][indialogue]==-2)whichsoundplay=firestartsound;
 									if(dialogueboxsound[whichdialogue][indialogue]==-3)whichsoundplay=consolesuccesssound;
 									if(dialogueboxsound[whichdialogue][indialogue]==-4)whichsoundplay=consolefailsound;
-									PlaySoundEx( whichsoundplay, samp[whichsoundplay], NULL, true);
-									OPENAL_3D_SetAttributes(channels[whichsoundplay], gLoc, vel);
-									OPENAL_SetVolume(channels[whichsoundplay], 256);
-									OPENAL_SetPaused(channels[whichsoundplay], false);
+									emit_sound_at(whichsoundplay, temppos);
 								}
 								if(Input::isKeyDown(attackkey))oldbuttondialogue=1;
 							}
@@ -3266,18 +3157,7 @@ void	Game::Tick()
 
 							player[1].coords=(temp+temp2)/2;
 
-							float gLoc[3];
-							float vel[3];
-							gLoc[0]=player[1].coords.x;
-							gLoc[1]=player[1].coords.y;
-							gLoc[2]=player[1].coords.z;
-							vel[0]=0;
-							vel[1]=0;
-							vel[2]=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, player[1].coords);
 
 							for(i=0;i<player[1].skeleton.num_joints;i++){
 								if(Random()%2==0){
@@ -3518,18 +3398,7 @@ void	Game::Tick()
 							tutorialmaxtime=8;
 
 							XYZ temp,temp2;
-							float gLoc[3];
-							float vel[3];
-							gLoc[0]=player[1].coords.x;
-							gLoc[1]=player[1].coords.y;
-							gLoc[2]=player[1].coords.z;
-							vel[0]=0;
-							vel[1]=0;
-							vel[2]=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, player[1].coords);
 
 							for(i=0;i<player[1].skeleton.num_joints;i++){
 								if(Random()%2==0){
@@ -3673,9 +3542,7 @@ void	Game::Tick()
 
 
 						if(tutorialstagetime==tutorialmaxtime-3){
-							PlaySoundEx( consolesuccesssound, samp[consolesuccesssound], NULL, true);
-							OPENAL_SetVolume(channels[consolesuccesssound], 256);
-							OPENAL_SetPaused(channels[consolesuccesssound], false);
+							emit_sound_np(consolesuccesssound);
 						}
 
 						if(tutorialsuccess>=1){
@@ -3693,16 +3560,12 @@ void	Game::Tick()
 
 					if(tutoriallevel!=1){
 						if(bonustime==0&&bonus!=solidhit&&bonus!=spinecrusher&&bonus!=tracheotomy&&bonus!=backstab&&bonusvalue>10){
-							PlaySoundEx( consolesuccesssound, samp[consolesuccesssound], NULL, true);
-							OPENAL_SetVolume(channels[consolesuccesssound], 256);
-							OPENAL_SetPaused(channels[consolesuccesssound], false);
+							emit_sound_np(consolesuccesssound);
 						}
 					}
 					else
 						if(bonustime==0){
-							PlaySoundEx( fireendsound, samp[fireendsound], NULL, true);
-							OPENAL_SetVolume(channels[fireendsound], 256);
-							OPENAL_SetPaused(channels[fireendsound], false);
+							emit_sound_np(fireendsound);
 						}
 						if(bonustime==0){
 							if(bonus!=solidhit&&bonus!=twoxcombo&&bonus!=threexcombo&&bonus!=fourxcombo&&bonus!=megacombo)bonusnum[bonus]++;
@@ -3808,19 +3671,8 @@ void	Game::Tick()
 															player[k].target=0;
 															player[k].targetanimation=walljumpleftanim;
 															player[k].targetframe=0;
-															float gLoc[3];
-															float vel[3];
-															gLoc[0]=player[k].coords.x;
-															gLoc[1]=player[k].coords.y;
-															gLoc[2]=player[k].coords.z;
-															vel[0]=0;
-															vel[1]=0;
-															vel[2]=0;
-															PlaySoundEx( movewhooshsound, samp[movewhooshsound], NULL, true);
-															OPENAL_3D_SetAttributes(channels[movewhooshsound], gLoc, vel);
-															OPENAL_SetVolume(channels[movewhooshsound], 256);
-															OPENAL_SetPaused(channels[movewhooshsound], false);
-															if(k==0)OPENAL_SetPaused(channels[whooshsound], true);
+															emit_sound_at(movewhooshsound, player[k].coords);
+															if(k==0)pause_sound(whooshsound);
 
 															lowpointtarget=DoRotation(objects.model[i].facenormals[whichhit],0,objects.rotation[i],0);
 															player[k].rotation=-asin(0-lowpointtarget.x);
@@ -3839,19 +3691,8 @@ void	Game::Tick()
 																player[k].target=0;
 																player[k].targetanimation=walljumprightanim;
 																player[k].targetframe=0;
-																float gLoc[3];
-																float vel[3];
-																gLoc[0]=player[k].coords.x;
-																gLoc[1]=player[k].coords.y;
-																gLoc[2]=player[k].coords.z;
-																vel[0]=0;
-																vel[1]=0;
-																vel[2]=0;
-																PlaySoundEx( movewhooshsound, samp[movewhooshsound], NULL, true);
-																OPENAL_3D_SetAttributes(channels[movewhooshsound], gLoc, vel);
-																OPENAL_SetVolume(channels[movewhooshsound], 256);
-																OPENAL_SetPaused(channels[movewhooshsound], false);
-																if(k==0)OPENAL_SetPaused(channels[whooshsound], true);
+																emit_sound_at(movewhooshsound, player[k].coords);
+																if(k==0)pause_sound(whooshsound);
 
 																lowpointtarget=DoRotation(objects.model[i].facenormals[whichhit],0,objects.rotation[i],0);
 																player[k].rotation=-asin(0-lowpointtarget.x);
@@ -3870,19 +3711,8 @@ void	Game::Tick()
 																	player[k].target=0;
 																	player[k].targetanimation=walljumpbackanim;
 																	player[k].targetframe=0;
-																	float gLoc[3];
-																	float vel[3];
-																	gLoc[0]=player[k].coords.x;
-																	gLoc[1]=player[k].coords.y;
-																	gLoc[2]=player[k].coords.z;
-																	vel[0]=0;
-																	vel[1]=0;
-																	vel[2]=0;
-																	PlaySoundEx( movewhooshsound, samp[movewhooshsound], NULL, true);
-																	OPENAL_3D_SetAttributes(channels[movewhooshsound], gLoc, vel);
-																	OPENAL_SetVolume(channels[movewhooshsound], 256);
-																	OPENAL_SetPaused(channels[movewhooshsound], false);
-																	if(k==0)OPENAL_SetPaused(channels[whooshsound], true);
+																	emit_sound_at(movewhooshsound, player[k].coords);
+																	if(k==0)pause_sound(whooshsound);
 
 																	lowpointtarget=DoRotation(objects.model[i].facenormals[whichhit],0,objects.rotation[i],0);
 																	player[k].rotation=-asin(0-lowpointtarget.x);
@@ -3901,19 +3731,8 @@ void	Game::Tick()
 																		player[k].target=0;
 																		player[k].targetanimation=walljumpfrontanim;
 																		player[k].targetframe=0;
-																		float gLoc[3];
-																		float vel[3];
-																		gLoc[0]=player[k].coords.x;
-																		gLoc[1]=player[k].coords.y;
-																		gLoc[2]=player[k].coords.z;
-																		vel[0]=0;
-																		vel[1]=0;
-																		vel[2]=0;
-																		PlaySoundEx( movewhooshsound, samp[movewhooshsound], NULL, true);
-																		OPENAL_3D_SetAttributes(channels[movewhooshsound], gLoc, vel);
-																		OPENAL_SetVolume(channels[movewhooshsound], 256);
-																		OPENAL_SetPaused(channels[movewhooshsound], false);
-																		if(k==0)OPENAL_SetPaused(channels[whooshsound], true);
+																		emit_sound_at(movewhooshsound, player[k].coords);
+																		if(k==0)pause_sound(whooshsound);
 
 																		lowpointtarget=DoRotation(objects.model[i].facenormals[whichhit],0,objects.rotation[i],0);
 																		player[k].rotation=-asin(0-lowpointtarget.x);
@@ -3948,25 +3767,14 @@ void	Game::Tick()
 														player[k].onterrain=1;
 
 														if(player[k].id==0){
-															OPENAL_SetPaused(channels[whooshsound], true);
+															pause_sound(whooshsound);
 															OPENAL_SetVolume(channels[whooshsound], 0);
 														}
 
 														if((player[k].targetanimation==jumpdownanim||player[k].isFlip())&&!player[k].wasLanding()){
 															if(player[k].isFlip())player[k].jumppower=-4;
 															player[k].targetanimation=player[k].getLanding();
-															float gLoc[3];
-															float vel[3];
-															gLoc[0]=player[k].coords.x;
-															gLoc[1]=player[k].coords.y;
-															gLoc[2]=player[k].coords.z;
-															vel[0]=player[k].velocity.x;
-															vel[1]=player[k].velocity.y;
-															vel[2]=player[k].velocity.z;
-															PlaySoundEx( landsound, samp[landsound], NULL, true);
-															OPENAL_3D_SetAttributes(channels[landsound], gLoc, vel);
-															OPENAL_SetVolume(channels[landsound], 128);
-															OPENAL_SetPaused(channels[landsound], false);
+															emit_sound_at(landsound, player[k].coords, 128.);
 															if(k==0){
 																envsound[numenvsounds]=player[k].coords;
 																envsoundvol[numenvsounds]=16;
@@ -4064,20 +3872,9 @@ void	Game::Tick()
 
 																									if(j>10||!player[k].isRun()){
 																										if(player[k].targetanimation==jumpdownanim||player[k].targetanimation==jumpupanim){
-																											if(k==0)OPENAL_SetPaused(channels[whooshsound], true);
+																											if(k==0)pause_sound(whooshsound);
 																										}
-																										float gLoc[3];
-																										float vel[3];
-																										gLoc[0]=player[k].coords.x;
-																										gLoc[1]=player[k].coords.y;
-																										gLoc[2]=player[k].coords.z;
-																										vel[0]=player[k].velocity.x;
-																										vel[1]=player[k].velocity.y;
-																										vel[2]=player[k].velocity.z;
-																										PlaySoundEx( jumpsound, samp[jumpsound], NULL, true);
-																										OPENAL_3D_SetAttributes(channels[jumpsound], gLoc, vel);
-																										OPENAL_SetVolume(channels[jumpsound], 128);
-																										OPENAL_SetPaused(channels[jumpsound], false);
+																										emit_sound_at(jumpsound, player[k].coords, 128.);
 
 																										lowpointtarget=DoRotation(objects.model[i].facenormals[whichhit],0,objects.rotation[i],0);
 																										player[k].rotation=-asin(0-lowpointtarget.x);
@@ -4127,20 +3924,8 @@ void	Game::Tick()
 														player[k].targetframe=0;
 														player[k].target=0;
 
-														float gLoc[3];
-														float vel[3];
-														gLoc[0]=player[k].coords.x;
-														gLoc[1]=player[k].coords.y;
-														gLoc[2]=player[k].coords.z;
-														vel[0]=player[k].velocity.x;
-														vel[1]=player[k].velocity.y;
-														vel[2]=player[k].velocity.z;
-														if(k==0){
-															PlaySoundEx( whooshsound, samp[whooshsound], NULL, true);
-															OPENAL_3D_SetAttributes(channels[whooshsound], gLoc, vel);
-															OPENAL_SetVolume(channels[whooshsound], 128);
-															OPENAL_SetPaused(channels[whooshsound], false);
-														}
+														if(!k)
+														  emit_sound_at(whooshsound, player[k].coords, 128.);
 													}
 													player[k].velocity.y+=gravity;
 												}
@@ -4232,19 +4017,12 @@ void	Game::Tick()
 										indialogue++;
 										if(indialogue<numdialogueboxes[whichdialogue]){
 											if(dialogueboxsound[whichdialogue][indialogue]!=0){
-												static float gLoc[3];
-												static float vel[3];
 												XYZ temppos;
 												temppos=player[participantfocus[whichdialogue][indialogue]].coords;
 												temppos=temppos-viewer;
 												Normalise(&temppos);
 												temppos+=viewer;
 
-												gLoc[0]=temppos.x;
-												gLoc[1]=temppos.y;
-												gLoc[2]=temppos.z;vel[0]=0;
-												vel[1]=0;
-												vel[2]=0;
 												int whichsoundplay;
 												if(dialogueboxsound[whichdialogue][indialogue]==1)whichsoundplay=rabbitchitter;
 												if(dialogueboxsound[whichdialogue][indialogue]==2)whichsoundplay=rabbitchitter2;
@@ -4266,10 +4044,7 @@ void	Game::Tick()
 												if(dialogueboxsound[whichdialogue][indialogue]==-2)whichsoundplay=firestartsound;
 												if(dialogueboxsound[whichdialogue][indialogue]==-3)whichsoundplay=consolesuccesssound;
 												if(dialogueboxsound[whichdialogue][indialogue]==-4)whichsoundplay=consolefailsound;
-												PlaySoundEx( whichsoundplay, samp[whichsoundplay], NULL, true);
-												OPENAL_3D_SetAttributes(channels[whichsoundplay], gLoc, vel);
-												OPENAL_SetVolume(channels[whichsoundplay], 256);
-												OPENAL_SetPaused(channels[whichsoundplay], false);
+												emit_sound_at(whichsoundplay, temppos);
 											}
 										}
 
@@ -4307,7 +4082,7 @@ void	Game::Tick()
 											}
 							}
 							if(!directing){
-								OPENAL_SetPaused(channels[whooshsound], true);
+								pause_sound(whooshsound);
 								viewer=dialoguecamera[whichdialogue][indialogue];
 								if(viewer.y<terrain.getHeight(viewer.x,viewer.z)+.1){
 									viewer.y=terrain.getHeight(viewer.x,viewer.z)+.1;
@@ -4322,19 +4097,12 @@ void	Game::Tick()
 											endkeydown=1;
 											if(indialogue<numdialogueboxes[whichdialogue]){
 												if(dialogueboxsound[whichdialogue][indialogue]!=0){
-													static float gLoc[3];
-													static float vel[3];
 													XYZ temppos;
 													temppos=player[participantfocus[whichdialogue][indialogue]].coords;
 													temppos=temppos-viewer;
 													Normalise(&temppos);
 													temppos+=viewer;
 
-													gLoc[0]=temppos.x;
-													gLoc[1]=temppos.y;
-													gLoc[2]=temppos.z;vel[0]=0;
-													vel[1]=0;
-													vel[2]=0;
 													int whichsoundplay;
 													if(dialogueboxsound[whichdialogue][indialogue]==1)whichsoundplay=rabbitchitter;
 													if(dialogueboxsound[whichdialogue][indialogue]==2)whichsoundplay=rabbitchitter2;
@@ -4358,10 +4126,7 @@ void	Game::Tick()
 													if(dialogueboxsound[whichdialogue][indialogue]==-4)whichsoundplay=consolefailsound;
 													if(dialogueboxsound[whichdialogue][indialogue]==-6)whichsoundplay=alarmsound;
 													if(dialogueboxsound[whichdialogue][indialogue]!=-5){
-														PlaySoundEx( whichsoundplay, samp[whichsoundplay], NULL, true);
-														OPENAL_3D_SetAttributes(channels[whichsoundplay], gLoc, vel);
-														OPENAL_SetVolume(channels[whichsoundplay], 256);
-														OPENAL_SetPaused(channels[whichsoundplay], false);
+														emit_sound_at(whichsoundplay, temppos);
 													}
 													if(dialogueboxsound[whichdialogue][indialogue]==-5){
 														hotspot[numhotspots]=player[0].coords;
@@ -4428,18 +4193,7 @@ void	Game::Tick()
 
 						if(hawkcalldelay<=0)
 						{
-							static float gLoc[3];
-							static float vel[3];
-							gLoc[0]=realhawkcoords.x;
-							gLoc[1]=realhawkcoords.y;
-							gLoc[2]=realhawkcoords.z;
-							vel[0]=0;
-							vel[1]=0;
-							vel[2]=0;
-							PlaySoundEx( hawksound, samp[hawksound], NULL, true);
-							OPENAL_3D_SetAttributes(channels[hawksound], gLoc, vel);
-							OPENAL_SetVolume(channels[hawksound], 128);
-							OPENAL_SetPaused(channels[hawksound], false);
+							emit_sound_at(hawksound, realhawkcoords);
 
 							hawkcalldelay=16+abs(Random()%8);
 						}
@@ -4606,7 +4360,7 @@ void	Game::Tick()
 										tintb=player[closest].clothestintb[i];
 										AddClothes((char *)player[closest].clothes[i],0,1,&player[closest].skeleton.skinText[0],&player[closest].skeleton.skinsize);
 									}
-									player[closest].DoMipmaps(5,0,0,player[closest].skeleton.skinsize,player[closest].skeleton.skinsize);
+									player[closest].DoMipmaps();
 								}
 
 								detailtogglekeydown=1;
@@ -4740,23 +4494,8 @@ void	Game::Tick()
 									}
 									Sprite::MakeSprite(cloudsprite, flatfacing2,flatvelocity2*0, .6,0,0, 1, .5);
 
-									float gLoc[3];
-									float vel[3];
-									gLoc[0]=blah.x;
-									gLoc[1]=blah.y;
-									gLoc[2]=blah.z;
-									vel[0]=0;
-									vel[1]=0;
-									vel[2]=0;
-									PlaySoundEx( splattersound, samp[splattersound], NULL, true);
-									OPENAL_3D_SetAttributes(channels[splattersound], gLoc, vel);
-									OPENAL_SetVolume(channels[splattersound], 256);
-									OPENAL_SetPaused(channels[splattersound], false);
-
-									PlaySoundEx( breaksound2, samp[breaksound2], NULL, true);
-									OPENAL_3D_SetAttributes(channels[breaksound2], gLoc, vel);
-									OPENAL_SetVolume(channels[breaksound2], 100);
-									OPENAL_SetPaused(channels[breaksound2], false);
+									emit_sound_at(splattersound, blah);
+									emit_sound_at(breaksound2, blah, 100.);
 
 									if(player[closest].skeleton.free==2)player[closest].skeleton.free=0;
 									player[closest].RagDoll(0);
@@ -4788,24 +4527,9 @@ void	Game::Tick()
 								}
 
 								if(closest!=-1){
-									float gLoc[3];
-									float vel[3];
-									gLoc[0]=blah.x;
-									gLoc[1]=blah.y;
-									gLoc[2]=blah.z;
-									vel[0]=0;
-									vel[1]=0;
-									vel[2]=0;
-
-									PlaySoundEx( splattersound, samp[splattersound], NULL, true);
-									OPENAL_3D_SetAttributes(channels[splattersound], gLoc, vel);
-									OPENAL_SetVolume(channels[splattersound], 256);
-									OPENAL_SetPaused(channels[splattersound], false);
-
-									PlaySoundEx( breaksound2, samp[breaksound2], NULL, true);
-									OPENAL_3D_SetAttributes(channels[breaksound2], gLoc, vel);
-									OPENAL_SetVolume(channels[breaksound2], 600);
-									OPENAL_SetPaused(channels[breaksound2], false);
+									emit_sound_at(splattersound, blah);
+
+									emit_sound_at(breaksound2, blah);
 
 									for(i=0;i<player[closest].skeleton.num_joints; i++){
 										if(!player[closest].skeleton.free)flatvelocity2=player[closest].velocity;
@@ -4904,19 +4628,8 @@ void	Game::Tick()
 								player[0].CatchFire();
 							}
 							if(!player[0].onfire){
-								float gLoc[3];
-								float vel[3];
-								gLoc[0]=player[0].coords.x;
-								gLoc[1]=player[0].coords.y;
-								gLoc[2]=player[0].coords.z;
-								vel[0]=0;
-								vel[1]=0;
-								vel[2]=0;
-								PlaySoundEx( fireendsound, samp[fireendsound], NULL, true);
-								OPENAL_3D_SetAttributes(channels[fireendsound], gLoc, vel);
-								OPENAL_SetVolume(channels[fireendsound], 256);
-								OPENAL_SetPaused(channels[fireendsound], false);
-								OPENAL_SetPaused(channels[stream_firesound], true);
+								emit_sound_at(fireendsound, player[0].coords);
+								pause_sound(stream_firesound);
 							}
 							slomotogglekeydown=1;
 						}
@@ -5105,7 +4818,7 @@ void	Game::Tick()
 										AddClothes((char *)player[numplayers].clothes[i],0,1,&player[numplayers].skeleton.skinText[0],&player[numplayers].skeleton.skinsize);
 									}
 									if(player[numplayers].numclothes){
-										player[numplayers].DoMipmaps(5,0,0,player[numplayers].skeleton.skinsize,player[numplayers].skeleton.skinsize);
+										player[numplayers].DoMipmaps();
 									}
 
 									player[numplayers].power=player[0].power;
@@ -5301,19 +5014,7 @@ void	Game::Tick()
 							//player[0].spurt=1;
 							//player[0].DoDamage(1000);
 
-							float gLoc[3];
-							float vel[3];
-							gLoc[0]=player[0].coords.x;
-							gLoc[1]=player[0].coords.y;
-							gLoc[2]=player[0].coords.z;
-							vel[0]=player[0].velocity.x;
-							vel[1]=player[0].velocity.y;
-							vel[2]=player[0].velocity.z;
-							PlaySoundEx( whooshsound, samp[whooshsound], NULL, true);
-							OPENAL_3D_SetAttributes(channels[whooshsound], gLoc, vel);
-							OPENAL_SetVolume(channels[whooshsound], 128);
-							OPENAL_SetPaused(channels[whooshsound], false);
-							//OPENAL_SetPaused(channels[whooshsound], true);
+							emit_sound_at(whooshsound, player[0].coords, 128.);
 
 							texturesizetogglekeydown=1;
 						}
@@ -5724,35 +5425,20 @@ void	Game::Tick()
 																										if(((((findLengthfast(&rotatetarget)>150&&(i!=0&&k!=0))||(findLengthfast(&rotatetarget)>50&&player[0].rabbitkickragdoll/*currentanimation==rabbitkickanim*/&&(i==0||k==0)))&&normaldotproduct(rotatetarget,player[k].coords-player[i].coords)>0)&&((i==0||k==0)||((player[i].skeleton.oldfree==1&&k!=0&&animation[player[k].currentanimation].attack==neutral)||(player[k].skeleton.oldfree==1&&i!=0&&animation[player[i].currentanimation].attack==neutral)||(player[i].isFlip()&&!player[i].skeleton.oldfree&&(i==0||k==0))||(player[k].isFlip()&&!player[k].skeleton.oldfree&&(i==0||k==0))||(i==0||k==0))))||((player[i].targetanimation==jumpupanim||player[i].targetanimation==jumpdownanim||player[i].isFlip())&&(player[k].targetanimation==jumpupanim||player[k].targetanimation==jumpdownanim||player[k].isFlip())&&(i==0||k==0)&&(!player[i].skeleton.oldfree&&!player[k].skeleton.oldfree))){
 																											//If hit by body
 																											if((i!=0||player[i].skeleton.free)&&(k!=0||player[k].skeleton.free)||(animation[player[i].targetanimation].height==highheight&&animation[player[k].targetanimation].height==highheight)){
-																												static float gLoc[3];
-																												static float vel[3];
-																												gLoc[0]=player[i].coords.x;
-																												gLoc[1]=player[i].coords.y;
-																												gLoc[2]=player[i].coords.z;
-																												vel[0]=player[i].velocity.x;
-																												vel[1]=player[i].velocity.y;
-																												vel[2]=player[i].velocity.z;
 																												if(tutoriallevel!=1){
-																													PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, true);
-																													OPENAL_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel);
-																													OPENAL_SetVolume(channels[heavyimpactsound], 256);
-																													OPENAL_SetPaused(channels[heavyimpactsound], false);
+																													emit_sound_at(heavyimpactsound, player[i].coords);
 																												}
 																												//player[i].velocity=player[k].velocity;
 																												//player[k].velocity=player[i].velocity;
 
 																												player[i].RagDoll(0);
 																												if(player[i].damage>player[i].damagetolerance-findLengthfast(&rotatetarget)/4&&!player[i].dead){
-																													bonus=aimbonus;
-																													bonustime=0;
-																													bonusvalue=150;
+																												  award_bonus(0, aimbonus);
 																												}
 																												player[i].DoDamage(findLengthfast(&rotatetarget)/4);
 																												player[k].RagDoll(0);
 																												if(player[k].damage>player[k].damagetolerance-findLengthfast(&rotatetarget)/4&&!player[k].dead){
-																													bonus=aimbonus;
-																													bonustime=0;
-																													bonusvalue=150;
+																												  award_bonus(0, aimbonus); // Huh, again?
 																												}
 																												player[k].DoDamage(findLengthfast(&rotatetarget)/4);
 
@@ -5818,11 +5504,7 @@ void	Game::Tick()
 																														player[i].DoDamage(20);
 																														player[i].RagDoll(0);
 																														player[k].lastcollide=1;
-																														if(k==0){
-																															bonus=AboveBonus;
-																															bonustime=0;
-																															bonusvalue=50;
-																														}
+																														award_bonus(k, AboveBonus);
 																													}
 																													if(i==0&&k!=0&&player[i].targetanimation==jumpdownanim&&!player[k].isCrouch()&&player[k].targetanimation!=rollanim&&!player[i].skeleton.oldfree&&!player[i].skeleton.free&&player[i].lastcollide<=0&&player[i].velocity.y<-10){
 																														player[k].velocity=player[i].velocity;
@@ -5832,11 +5514,7 @@ void	Game::Tick()
 																														player[k].DoDamage(20);
 																														player[k].RagDoll(0);
 																														player[i].lastcollide=1;
-																														if(i==0){
-																															bonus=AboveBonus;
-																															bonustime=0;
-																															bonusvalue=50;
-																														}
+																														award_bonus(i, AboveBonus);
 																													}
 																												}
 																											}
@@ -6975,20 +6653,8 @@ void	Game::Tick()
 																if((((weapons.velocity[j].x==0&&weapons.velocity[j].y==0&&weapons.velocity[j].z==0)||player[i].aitype==playercontrolled)&&weapons.owner[j]==-1)||(player[i].victim&&weapons.owner[j]==player[i].victim->id))
 																	if(findDistancefastflat(&player[i].coords,&weapons.position[j])<2&&player[i].weaponactive==-1){
 																		if(findDistancefast(&player[i].coords,&weapons.position[j])<1||player[i].victim){
-																			float gLoc[3];
-																			float vel[3];
-																			gLoc[0]=player[i].coords.x;
-																			gLoc[1]=player[i].coords.y;
-																			gLoc[2]=player[i].coords.z;
-																			vel[0]=player[i].velocity.x;
-																			vel[1]=player[i].velocity.y;
-																			vel[2]=player[i].velocity.z;
-																			if(weapons.type[j]!=staff){
-																				PlaySoundEx( knifedrawsound, samp[knifedrawsound], NULL, true);
-																				OPENAL_3D_SetAttributes(channels[knifedrawsound], gLoc, vel);
-																				OPENAL_SetVolume(channels[knifedrawsound], 128);
-																				OPENAL_SetPaused(channels[knifedrawsound], false);
-																			}
+																			if(weapons.type[j]!=staff)
+																			  emit_sound_at(knifedrawsound, player[i].coords, 128.);
 
 																			player[i].weaponactive=0;
 																			weapons.owner[j]=player[i].id;
@@ -7022,20 +6688,8 @@ void	Game::Tick()
 																	if(player[i].weaponactive==-1)
 																		if((((weapons.velocity[k].x==0&&weapons.velocity[k].y==0&&weapons.velocity[k].z==0)||player[i].aitype==playercontrolled)&&weapons.owner[k]==-1)||(player[i].victim&&weapons.owner[k]==player[i].victim->id))
 																			if(findDistancefastflat(&player[i].coords,&weapons.position[k])<3&&player[i].weaponactive==-1){
-																				float gLoc[3];
-																				float vel[3];
-																				gLoc[0]=player[i].coords.x;
-																				gLoc[1]=player[i].coords.y;
-																				gLoc[2]=player[i].coords.z;
-																				vel[0]=player[i].velocity.x;
-																				vel[1]=player[i].velocity.y;
-																				vel[2]=player[i].velocity.z;
-																				if(weapons.type[k]!=staff){
-																					PlaySoundEx( knifedrawsound, samp[knifedrawsound], NULL, true);
-																					OPENAL_3D_SetAttributes(channels[knifedrawsound], gLoc, vel);
-																					OPENAL_SetVolume(channels[knifedrawsound], 128);
-																					OPENAL_SetPaused(channels[knifedrawsound], false);
-																				}
+																				if(weapons.type[k]!=staff)
+																				  emit_sound_at(knifedrawsound, player[i].coords, 128.);
 
 																				player[i].weaponactive=0;
 																				weapons.owner[k]=player[i].id;
@@ -7075,14 +6729,6 @@ void	Game::Tick()
 																		player[i].hasvictim=1;
 																		int k = player[j].weaponids[0];
 																		if(player[i].hasvictim){
-																			float gLoc[3];
-																			float vel[3];
-																			gLoc[0]=player[i].coords.x;
-																			gLoc[1]=player[i].coords.y;
-																			gLoc[2]=player[i].coords.z;
-																			vel[0]=player[i].velocity.x;
-																			vel[1]=player[i].velocity.y;
-																			vel[2]=player[i].velocity.z;
 																			bool fleshstuck;
 																			fleshstuck=0;
 																			if(player[i].victim->weaponstuck!=-1){
@@ -7091,19 +6737,11 @@ void	Game::Tick()
 																				}
 																			}
 																			if(!fleshstuck){
-																				if(weapons.type[k]!=staff){
-																					PlaySoundEx( knifedrawsound, samp[knifedrawsound], NULL, true);
-																					OPENAL_3D_SetAttributes(channels[knifedrawsound], gLoc, vel);
-																					OPENAL_SetVolume(channels[knifedrawsound], 128);
-																					OPENAL_SetPaused(channels[knifedrawsound], false);
-																				}
-																			}
-																			if(fleshstuck){
-																				PlaySoundEx( fleshstabremovesound, samp[fleshstabremovesound], NULL, true);
-																				OPENAL_3D_SetAttributes(channels[fleshstabremovesound], gLoc, vel);
-																				OPENAL_SetVolume(channels[fleshstabremovesound], 128);
-																				OPENAL_SetPaused(channels[fleshstabremovesound], false);
+																				if(weapons.type[k]!=staff)
+																				  emit_sound_at(knifedrawsound, player[i].coords, 128.);
 																			}
+																			if(fleshstuck)
+																			  emit_sound_at(fleshstabremovesound, player[i].coords, 128.);
 
 																			player[i].weaponactive=0;
 																			if(weapons.owner[k]!=-1){
@@ -7517,26 +7155,10 @@ void	Game::Tick()
 														player[i].coords.y+=.2;
 														player[i].jumppower-=1;
 
-														static float gLoc[3];
-														static float vel[3];
-														gLoc[0]=player[i].coords.x;
-														gLoc[1]=player[i].coords.y;
-														gLoc[2]=player[i].coords.z;
-														vel[0]=player[i].velocity.x;
-														vel[1]=player[i].velocity.y;
-														vel[2]=player[i].velocity.z;
-
-														if(i==0){
-															PlaySoundEx( whooshsound, samp[whooshsound], NULL, true);
-															OPENAL_3D_SetAttributes(channels[whooshsound], gLoc, vel);
-															OPENAL_SetVolume(channels[whooshsound], 128);
-															OPENAL_SetPaused(channels[whooshsound], false);
-														}
+														if (!i)
+														  emit_sound_at(whooshsound, player[i].coords, 128.);
 
-														PlaySoundEx( jumpsound, samp[jumpsound], NULL, true);
-														OPENAL_3D_SetAttributes(channels[jumpsound], gLoc, vel);
-														OPENAL_SetVolume(channels[jumpsound], 128);
-														OPENAL_SetPaused(channels[jumpsound], false);
+														emit_sound_at(jumpsound, player[i].coords, 128.);
 												}
 												if((player[i].isIdle())&&player[i].jumppower>1){
 													player[i].targetanimation=player[i].getLanding();
@@ -7667,9 +7289,7 @@ void	Game::Tick()
 										OPENAL_StopSound(OPENAL_ALL);  // hack...OpenAL renderer isn't stopping music after tutorial goes to level menu...
 										OPENAL_SetFrequency(OPENAL_ALL, 0.001);
 
-										PlayStreamEx( stream_music3, strm[stream_music3], NULL, true);
-										OPENAL_SetPaused(channels[stream_music3], false);
-										OPENAL_SetVolume(channels[stream_music3], 256);
+										emit_stream_np(stream_music3);
 
 										gameon=0;
 										mainmenu=5;
@@ -7680,18 +7300,7 @@ void	Game::Tick()
 									}
 									if(tutorialstage<51)
 										if(findDistancefast(&temp,&player[0].coords)>=findDistancefast(&temp,&temp2)-1||findDistancefast(&temp3,&player[0].coords)<4){
-											float gLoc[3];
-											float vel[3];
-											gLoc[0]=player[0].coords.x;
-											gLoc[1]=player[0].coords.y;
-											gLoc[2]=player[0].coords.z;
-											vel[0]=0;
-											vel[1]=0;
-											vel[2]=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, player[0].coords);
 
 											player[0].coords=(oldtemp+oldtemp2)/2;
 
@@ -7699,18 +7308,7 @@ void	Game::Tick()
 										}
 										if(tutorialstage>=14&&tutorialstage<50)
 											if(findDistancefast(&temp,&player[1].coords)>=findDistancefast(&temp,&temp2)-1||findDistancefast(&temp3,&player[1].coords)<4){
-												float gLoc[3];
-												float vel[3];
-												gLoc[0]=player[1].coords.x;
-												gLoc[1]=player[1].coords.y;
-												gLoc[2]=player[1].coords.z;
-												vel[0]=0;
-												vel[1]=0;
-												vel[2]=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, player[1].coords);
 
 												for(int i=0;i<player[1].skeleton.num_joints;i++){
 													if(Random()%2==0){
@@ -7849,17 +7447,7 @@ void	Game::TickOnceAfter(){
 
 		if(musictoggle){
 			if(musictype!=oldmusictype&&musictype==stream_music2){
-				static float gLoc[3];
-				static float vel[3];
-				gLoc[0]=cameraloc.x;
-				gLoc[1]=cameraloc.y;
-				gLoc[2]=cameraloc.z;
-				vel[0]=0;
-				vel[1]=0;
-				vel[2]=0;
-				PlaySoundEx( alarmsound, samp[alarmsound], NULL, true);
-				OPENAL_SetVolume(channels[alarmsound], 512);
-				OPENAL_SetPaused(channels[alarmsound], false);
+				emit_sound_np(alarmsound);
 
 			}
 		}
@@ -7880,26 +7468,20 @@ void	Game::TickOnceAfter(){
 		if(musicvolume[2]>128&&!loading&&!mainmenu)musicvolume[2]=128;
 
 		if(musictoggle){
-			if(musicvolume[0]>0&&oldmusicvolume[0]<=0){
-				PlayStreamEx( music1, strm[music1], NULL, true);
-				OPENAL_SetPaused(channels[music1], false);
-			}
-			if(musicvolume[1]>0&&oldmusicvolume[1]<=0){
-				PlayStreamEx( stream_music2, strm[stream_music2], NULL, true);
-				OPENAL_SetPaused(channels[stream_music2], false);
-			}
-			if(musicvolume[2]>0&&oldmusicvolume[2]<=0){
-				PlayStreamEx( stream_music3, strm[stream_music3], NULL, true);
-				OPENAL_SetPaused(channels[stream_music3], false);
-			}
+			if(musicvolume[0]>0&&oldmusicvolume[0]<=0)
+			  emit_stream_np(music1, musicvolume[0]);
+			if(musicvolume[1]>0&&oldmusicvolume[1]<=0)
+			  emit_stream_np(stream_music2, musicvolume[1]);
+			if(musicvolume[2]>0&&oldmusicvolume[2]<=0)
+			  emit_stream_np(stream_music3, musicvolume[2]);
 			if(musicvolume[0]<=0&&oldmusicvolume[0]>0){
-				OPENAL_SetPaused(channels[music1], true);
+				pause_sound(music1);
 			}
 			if(musicvolume[1]<=0&&oldmusicvolume[1]>0){
-				OPENAL_SetPaused(channels[stream_music2], true);
+				pause_sound(stream_music2);
 			}
 			if(musicvolume[2]<=0&&oldmusicvolume[2]>0){
-				OPENAL_SetPaused(channels[stream_music3], true);
+				pause_sound(stream_music3);
 			}
 
 			if(musicvolume[0]!=oldmusicvolume[0]){
@@ -7916,9 +7498,9 @@ void	Game::TickOnceAfter(){
 				oldmusicvolume[i]=musicvolume[i];
 			}
 		} else {
-			OPENAL_SetPaused(channels[music1], true);
-			OPENAL_SetPaused(channels[stream_music2], true);
-			OPENAL_SetPaused(channels[stream_music3], true);
+			pause_sound(music1);
+			pause_sound(stream_music2);
+			pause_sound(stream_music3);
 
 			for(i=0;i<4;i++){
 				oldmusicvolume[i]=0;
@@ -8175,7 +7757,7 @@ void	Game::TickOnceAfter(){
 					campaign=1;
 					mainmenu=0;
 					gameon=1;
-					OPENAL_SetPaused(channels[stream_music3], true);
+					pause_sound(stream_music3);
 
 					stealthloading=0;
 				}