X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FPerson.cpp;h=3640a0b224d54a146a39d0e7f87b1bbd7bb809b0;hb=bba3631a5899f8f9f26fd596e13f097ae2d6f8b8;hp=244c11f4172bc21f3c6ead2250ce5120fd59869a;hpb=4f6fe7f0aa492634a219ae0f194d6640ec3da429;p=lugaru.git

diff --git a/Source/Person.cpp b/Source/Person.cpp
index 244c11f..3640a0b 100644
--- a/Source/Person.cpp
+++ b/Source/Person.cpp
@@ -67,7 +67,6 @@ extern bool tiltweird;
 extern bool midweird;
 extern bool proportionweird;
 extern bool vertexweird[6];
-extern GLubyte texturearray[512*512*3];
 extern XYZ envsound[30];
 extern float envsoundvol[30];
 extern float envsoundlife[30];
@@ -86,69 +85,64 @@ extern int indialogue;
 
 extern bool gamestarted;
 
-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 Person::CheckKick(){
-	static XYZ relative;
-	static int i;
-
-	float damagemult=1*power;
-	if(creature==wolftype)damagemult=2.5*power;
-	damagemult*=power;
-
-	if(hasvictim)
-		if(targetanimation==rabbitkickanim&&victim&&victim!=this&&currentframe>=2&&currentanimation==rabbitkickanim){
-			if(findDistancefast(&coords,&victim->coords)<1.2){
-				if(!victim->skeleton.free){
-					relative=velocity;
-					Normalise(&relative);
-					relative=coords+relative*1;
-					if(animation[victim->targetanimation].height!=lowheight){
-						victim->spurt=1;
-						DoBlood(.2,250);
-						if(tutoriallevel!=1)
-						  emit_sound_at(heavyimpactsound, victim->coords);
-						victim->RagDoll(0);
-						relative=velocity;
-						relative.y=0;
-						Normalise(&relative);
-						for(i=0;i<victim->skeleton.num_joints;i++){
-							victim->skeleton.joints[i].velocity+=relative*120*damagemult;
-						}
-						victim->Puff(neck);
-						victim->DoDamage(100*damagemult/victim->protectionhigh);
-						if(id==0)camerashake+=.4;
-
-						target=0;
-						currentframe=3;
-						targetanimation=backflipanim;
-						targetframe=4;
-						velocity=facing*-10;
-						velocity.y=5;
-						skeleton.free=0;
-						if(id==0)OPENAL_SetPaused(channels[whooshsound], false);
-
-						award_bonus(id, cannon);
-					}
-					else if (victim->isCrouch()){
-						targetanimation=rabbitkickreversedanim;
-						currentanimation=rabbitkickreversedanim;
-						victim->currentanimation=rabbitkickreversalanim;
-						victim->targetanimation=rabbitkickreversalanim;
-						targettilt2=0;
-						currentframe=0;
-						targetframe=1;
-						target=0;
-						velocity=0;
-						victim->oldcoords=victim->coords;
-						coords=victim->coords;
-						victim->targetrotation=targetrotation;
-						victim->victim=this;
-					}
-				}
-			}
-		}
+void Person::CheckKick()
+{
+  if (!(hasvictim
+	&& (targetanimation == rabbitkickanim
+	    && victim
+	    && victim != this
+	    && currentframe >= 2
+	    && currentanimation == rabbitkickanim)
+	&& (findDistancefast(&coords,&victim->coords) < 1.2)
+	&& (!victim->skeleton.free)))
+    return;
+
+  if (animation[victim->targetanimation].height!=lowheight)
+    {
+      float damagemult = (creature == wolftype ? 2.5 : 1.) * power * power;
+      XYZ relative = velocity;
+      relative.y=0;
+      Normalise(&relative);
+
+      victim->spurt=1;
+      DoBlood(.2,250);
+      if(tutoriallevel!=1)
+	emit_sound_at(heavyimpactsound, victim->coords);
+      victim->RagDoll(0);
+      for(int i=0;i<victim->skeleton.num_joints;i++){
+	victim->skeleton.joints[i].velocity+=relative*120*damagemult;
+      }
+      victim->Puff(neck);
+      victim->DoDamage(100*damagemult/victim->protectionhigh);
+      if(id==0)camerashake+=.4;
+
+      target=0;
+      currentframe=3;
+      targetanimation=backflipanim;
+      targetframe=4;
+      velocity=facing*-10;
+      velocity.y=5;
+      skeleton.free=0;
+      if(id==0)OPENAL_SetPaused(channels[whooshsound], false);
+
+      award_bonus(id, cannon);
+    }
+  else if (victim->isCrouch())
+    {
+      targetanimation=rabbitkickreversedanim;
+      currentanimation=rabbitkickreversedanim;
+      victim->currentanimation=rabbitkickreversalanim;
+      victim->targetanimation=rabbitkickreversalanim;
+      targettilt2=0;
+      currentframe=0;
+      targetframe=1;
+      target=0;
+      velocity=0;
+      victim->oldcoords=victim->coords;
+      coords=victim->coords;
+      victim->targetrotation=targetrotation;
+      victim->victim=this;
+    }
 }
 
 void Person::CatchFire(){
@@ -480,8 +474,7 @@ void Person::DoBloodBig(float howmuch,int which){
 								}
 							}
 							glBindTexture(GL_TEXTURE_2D,skeleton.drawmodel.textureptr);
-							if(detail!=2||osx)DoMipmaps(5,0,0,skeleton.skinsize,skeleton.skinsize);
-							else DoMipmaps(0,startx/realtexdetail,endx/realtexdetail,starty/realtexdetail,endy/realtexdetail);
+							DoMipmaps();
 
 							bleedxint=0;
 							bleedyint=0;
@@ -709,8 +702,7 @@ bool Person::DoBloodBigWhere(float howmuch,int which, XYZ where){
 								}
 							}
 							glBindTexture(GL_TEXTURE_2D,skeleton.drawmodel.textureptr);
-							if(detail!=2||osx)DoMipmaps(5,0,0,skeleton.skinsize,skeleton.skinsize);
-							else DoMipmaps(0,startx/realtexdetail,endx/realtexdetail,starty/realtexdetail,endy/realtexdetail);
+							DoMipmaps();
 
 							bleedy=(1+coordsy)*512;
 							bleedx=coordsx*512;
@@ -740,73 +732,6 @@ bool Person::DoBloodBigWhere(float howmuch,int which, XYZ where){
 }
 
 
-void Person::DoMipmaps(int howmanylevels,float startx, float endx, float starty, float endy){
-	int i,j,k;
-	static float temp;
-	static int bytesPerPixel=3;
-	static int newsize,totalsize,rowsize,bigstep,smallstep,sum;
-	static int newstartx,newstarty,newendx,newendy;
-	static int newnewstartx,newnewstarty,newnewendx,newnewendy;
-	static int which;
-	static float sizemult;
-	/*
-	for(i=0;i<skeleton.skinsize*skeleton.skinsize*bytesPerPixel;i++){
-	texture[i]=skeleton.skinText[i];
-	}
-	*/
-	if((!osx||howmanylevels)){
-
-		if(startx<0)startx=0;
-		if(starty<0)starty=0;
-		if(endx>skeleton.skinsize-1)endx=skeleton.skinsize-1;
-		if(endy>skeleton.skinsize-1)endy=skeleton.skinsize-1;
-		if((endx>startx&&endy>starty)||howmanylevels){
-
-			newstartx=startx;
-			newstarty=starty;
-			newendx=endx;
-			newendy=endy;
-
-			for(i=startx;i<endx;i++){
-				for(j=starty;j<endy;j++){
-					texturearray[(i-newstartx)*(newendy-newstarty)*3+(j-newstarty)*3+0]=skeleton.skinText[i*skeleton.skinsize*3+j*3+0];
-					texturearray[(i-newstartx)*(newendy-newstarty)*3+(j-newstarty)*3+1]=skeleton.skinText[i*skeleton.skinsize*3+j*3+1];
-					texturearray[(i-newstartx)*(newendy-newstarty)*3+(j-newstarty)*3+2]=skeleton.skinText[i*skeleton.skinsize*3+j*3+2];
-				}
-			}
-
-			glBindTexture(GL_TEXTURE_2D,skeleton.drawmodel.textureptr);
-
-			if(!howmanylevels){
-				if(!osx)glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS,GL_TRUE);
-				glTexSubImage2D(GL_TEXTURE_2D,0,starty,startx,endy-starty,endx-startx,GL_RGB,GL_UNSIGNED_BYTE,texturearray);
-				if(!osx)glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS,GL_FALSE);
-			}
-
-			newsize=skeleton.skinsize;
-
-			if(howmanylevels)
-				gluBuild2DMipmaps( GL_TEXTURE_2D, GL_RGB, skeleton.skinsize, skeleton.skinsize, GL_RGB, GL_UNSIGNED_BYTE, &skeleton.skinText[0] );
-		}
-		/*for(j=1;j<=howmanylevels;j++){
-		if(j==1)texpointer=&skeleton.skinText[0];
-		else texpointer=&texture[0];
-
-		totalsize=int( newsize*newsize*bytesPerPixel);
-		rowsize=int( newsize*bytesPerPixel );
-		bigstep=bytesPerPixel*newsize*2;
-		smallstep=bytesPerPixel*2;
-
-		which=0;
-
-
-
-		glTexSubImage2D(GL_TEXTURE_2D,j,0,0,newsize/2,newsize/2,GL_RGB,GL_UNSIGNED_BYTE,texture);
-		newsize/=2;
-		}*/
-	}
-}
-
 
 void Person::Reverse(){
 	if(victim->aitype==playercontrolled||hostiletime>1)
@@ -1026,10 +951,6 @@ void Person::Reverse(){
 
 
 
-					/*PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, true);
-					OPENAL_3D_SetAttributes(channels[metalhitsound], gLoc, vel);
-					OPENAL_SetVolume(channels[metalhitsound], 512);
-					OPENAL_SetPaused(channels[metalhitsound], false);*/
 				}
 
 				if(abs(Random()%20)==0){
@@ -1073,10 +994,6 @@ void Person::Reverse(){
 				 }
 
 
-					/*PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, true);
-					OPENAL_3D_SetAttributes(channels[metalhitsound], gLoc, vel);
-					OPENAL_SetVolume(channels[metalhitsound], 512);
-					OPENAL_SetPaused(channels[metalhitsound], false);*/
 				}
 			}
 			if(hasvictim)
@@ -1626,14 +1543,6 @@ void	Person::DoAnimations(){
 			if(tutoriallevel!=1||id==0)
 				if((animation[targetanimation].label[targetframe]&&(animation[targetanimation].label[targetframe]<5||animation[targetanimation].label[targetframe]==8))/*||(targetanimation==rollanim&&targetframe==animation[rollanim].numframes-1)*/){
 					int whichsound;
-					float gLoc[3];
-					float vel[3];
-					gLoc[0]=coords.x;
-					gLoc[1]=coords.y;
-					gLoc[2]=coords.z;
-					vel[0]=velocity.x;
-					vel[1]=velocity.y;
-					vel[2]=velocity.z;
 					if(onterrain){
 						if(terrain.getOpacity(coords.x,coords.z)<.2){
 							if(animation[targetanimation].label[targetframe]==1)whichsound=footstepsound;
@@ -1667,12 +1576,7 @@ void	Person::DoAnimations(){
 					else if(animation[targetanimation].label[targetframe]==4)whichsound=knifeswishsound;
 					if(animation[targetanimation].label[targetframe]==8&&tutoriallevel!=1)whichsound=landsound2;
 
-					PlaySoundEx( whichsound, samp[whichsound], NULL, true);
-					OPENAL_3D_SetAttributes(channels[whichsound], gLoc, vel);
-					if(whichsound!=knifeswishsound)OPENAL_SetVolume(channels[whichsound], 128);
-					if(whichsound!=knifeswishsound&&(targetanimation==staffhitanim||targetanimation==staffgroundsmashanim||targetanimation==staffspinhitanim))OPENAL_SetVolume(channels[whichsound], 256);
-					if(whichsound==knifeswishsound)OPENAL_SetVolume(channels[whichsound], 512);
-					OPENAL_SetPaused(channels[whichsound], false);
+					emit_sound_at(whichsound, coords, 256.);
 
 					if(id==0)
 						if(whichsound==footstepsound||whichsound==footstepsound2||whichsound==footstepsound3||whichsound==footstepsound4){
@@ -2630,11 +2534,6 @@ void	Person::DoAnimations(){
 												player[i].wentforweapon=0;
 											}
 
-											/*PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, true);
-											OPENAL_3D_SetAttributes(channels[metalhitsound], gLoc, vel);
-											OPENAL_SetVolume(channels[metalhitsound], 512);
-											OPENAL_SetPaused(channels[metalhitsound], false);*/
-
 										}
 									}
 								}
@@ -3946,7 +3845,7 @@ void	Person::DoStuff(){
 		bleeding-=multiplier*.3;
 		if(bloodtoggle==2){
 			glBindTexture(GL_TEXTURE_2D,skeleton.drawmodel.textureptr);
-			if(bleeding<=0&&(detail!=2||osx))DoMipmaps(5,0,0,skeleton.skinsize,skeleton.skinsize);
+			if(bleeding<=0&&(detail!=2||osx))DoMipmaps();
 		}
 	}
 
@@ -4073,7 +3972,7 @@ void	Person::DoStuff(){
 		}
 		if(!osx&&detail>1){
 			glBindTexture(GL_TEXTURE_2D,skeleton.drawmodel.textureptr);
-			DoMipmaps(0,startx,endx,starty,endy);
+			DoMipmaps();
 		}
 
 		if(!skeleton.free){