X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FPerson.cpp;h=47212bd59ac3eee01265620103cc9898e86e4f63;hb=710fa624080c2f2db7923832e2fd9945f4dd8254;hp=a6a9c504a2e32c26be88915a9a408704d1382473;hpb=291ea8c0692472bcf99ccd089b6de45610be85b9;p=lugaru.git

diff --git a/Source/Person.cpp b/Source/Person.cpp
index a6a9c50..47212bd 100644
--- a/Source/Person.cpp
+++ b/Source/Person.cpp
@@ -28,7 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Game.h"
 
 extern float multiplier;
-extern int channels[100];
 extern Terrain terrain;
 extern float gravity;
 extern int environment;
@@ -49,7 +48,6 @@ extern bool osx;
 extern bool autoslomo;
 extern float camerashake;
 extern float woozy;
-extern float terraindetail;
 extern float viewdistance;
 extern float blackout;
 extern int difficulty;
@@ -85,6 +83,8 @@ extern int indialogue;
 
 extern bool gamestarted;
 
+Person player[maxplayers];
+
 void Person::CheckKick()
 {
   if (!(hasvictim
@@ -1323,8 +1323,8 @@ void Person::RagDoll(bool checkcollision){
 				skeleton.joints[j].position-=average;
 			}
 
-			whichpatchx=coords.x/(terrain.size/subdivision*terrain.scale*terraindetail);
-			whichpatchz=coords.z/(terrain.size/subdivision*terrain.scale*terraindetail);
+			whichpatchx=coords.x/(terrain.size/subdivision*terrain.scale);
+			whichpatchz=coords.z/(terrain.size/subdivision*terrain.scale);
 			if(terrain.patchobjectnum[whichpatchx][whichpatchz])
 				for(l=0;l<terrain.patchobjectnum[whichpatchx][whichpatchz];l++){
 					i=terrain.patchobjects[whichpatchx][whichpatchz][l];
@@ -1502,7 +1502,7 @@ void	Person::DoAnimations(){
 			if(targetanimation==rollanim&&targetframe==3&&onfire){
 				onfire=0;
 				emit_sound_at(fireendsound, coords);
-				OPENAL_SetPaused(channels[stream_firesound], true);
+				pause_sound(stream_firesound);
 				deathbleeding=0;
 			}
 
@@ -3555,7 +3555,7 @@ void	Person::DoAnimations(){
 										escapednum++;
 										targetanimation=rollanim;
 										coords+=facing;
-										if(id==0)OPENAL_SetPaused(channels[whooshsound], true);
+										if(id==0)pause_sound(whooshsound);
 									}
 									lastfeint=0;
 								}
@@ -3578,7 +3578,7 @@ void	Person::DoAnimations(){
 										escapednum++;
 										targetanimation=rollanim;
 										coords+=facing*2;
-										if(id==0)OPENAL_SetPaused(channels[whooshsound], true);
+										if(id==0)pause_sound(whooshsound);
 									}
 									lastfeint=0;
 								}
@@ -4410,7 +4410,7 @@ void	Person::DoStuff(){
 	}
 
 	if(skeleton.free==1){
-		if(id==0)OPENAL_SetPaused(channels[whooshsound], true);
+		if(id==0)pause_sound(whooshsound);
 
 		if(!dead){
 			//If knocked over, open hands and close mouth
@@ -4473,7 +4473,7 @@ void	Person::DoStuff(){
 			skeleton.longdead+=(2000-findLength(&average))*multiplier+multiplier;
 			if(skeleton.longdead>2000){
 				if(skeleton.longdead>6000){
-					if(id==0)OPENAL_SetPaused(channels[whooshsound], true);
+					if(id==0)pause_sound(whooshsound);
 					skeleton.free=3;
 					DrawSkeleton();
 					skeleton.free=2;
@@ -4582,7 +4582,7 @@ void	Person::DoStuff(){
 		if(findLength(&average)<10&&!dead&&skeleton.free){
 			skeleton.longdead+=(2000-findLength(&average))*multiplier+multiplier;
 			if(skeleton.longdead>(damage+500)*1.5){
-				if(id==0)OPENAL_SetPaused(channels[whooshsound], true);
+				if(id==0)pause_sound(whooshsound);
 				skeleton.free=0;
 				velocity=0;
 				XYZ middle;
@@ -5294,7 +5294,7 @@ void	Person::DoStuff(){
 						onterrain=1;
 
 						if(id==0){
-							OPENAL_SetPaused(channels[whooshsound], true);
+							pause_sound(whooshsound);
 							OPENAL_SetVolume(channels[whooshsound], 0);
 						}
 
@@ -6183,7 +6183,7 @@ int Person::SphereCheck(XYZ *p1,float radius, XYZ *p, XYZ *move, float *rotate,
 								onterrain=1;
 
 								if(id==0){
-									OPENAL_SetPaused(channels[whooshsound], true);
+									pause_sound(whooshsound);
 									OPENAL_SetVolume(channels[whooshsound], 0);
 								}