X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FPerson.cpp;h=b73812151f35c760199201e59160c9de159e5873;hb=c84fb27b1b242249929b90c2b50f2c92c6a0556d;hp=e495d776ae696ca8d24308a91febb9357fdf63d7;hpb=9a5f2758e538d9216d255b4797f042a1b6874272;p=lugaru.git diff --git a/Source/Person.cpp b/Source/Person.cpp index e495d77..b738121 100644 --- a/Source/Person.cpp +++ b/Source/Person.cpp @@ -21,15 +21,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /**> HEADER FILES <**/ #include "Person.h" +#include "openal_wrapper.h" +#include "Animation.h" +#include "Sounds.h" +#include "Awards.h" +#include "Game.h" extern float multiplier; -extern Animation animation[animation_count]; -extern FSOUND_SAMPLE *samp[100]; extern int channels[100]; extern Terrain terrain; extern float gravity; extern int environment; -extern Sprites sprites; extern int detail; extern FRUSTUM frustum; extern XYZ viewer; @@ -51,11 +53,8 @@ extern float terraindetail; extern float viewdistance; extern float blackout; extern int difficulty; -extern Weapons weapons; extern bool decals; extern float fadestart; -extern Person player[maxplayers]; -extern int numplayers; extern bool freeze; extern bool winfreeze; extern float flashamount,flashr,flashg,flashb; @@ -73,10 +72,6 @@ extern XYZ envsound[30]; extern float envsoundvol[30]; extern float envsoundlife[30]; extern int numenvsounds; -extern int bonus; -extern float bonusvalue; -extern float bonustotal; -extern float bonustime; extern int tutoriallevel; extern float smoketex; extern int tutorialstage; @@ -84,33 +79,15 @@ extern bool reversaltrain; extern bool canattack; extern bool cananger; extern float damagedealt; -extern float damagetaken; extern int hostile; extern float hostiletime; -extern int mainmenu; - -extern int numfalls; -extern int numflipfail; -extern int numseen; -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 indialogue; extern bool gamestarted; -extern FSOUND_STREAM * strm[20]; -extern "C" void PlaySoundEx(int channel, FSOUND_SAMPLE *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused); -extern "C" void PlayStreamEx(int chan, FSOUND_STREAM *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused); +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; @@ -140,9 +117,9 @@ void Person::CheckKick(){ vel[2]=velocity.z; if(tutoriallevel!=1){ PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, true); - FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); - FSOUND_SetVolume(channels[heavyimpactsound], 128); - FSOUND_SetPaused(channels[heavyimpactsound], false); + OPENAL_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); + OPENAL_SetVolume(channels[heavyimpactsound], 128); + OPENAL_SetPaused(channels[heavyimpactsound], false); } victim->RagDoll(0); relative=velocity; @@ -162,15 +139,9 @@ void Person::CheckKick(){ velocity=facing*-10; velocity.y=5; skeleton.free=0; - if(id==0)FSOUND_SetPaused(channels[whooshsound], false); + if(id==0)OPENAL_SetPaused(channels[whooshsound], false); - //if(victim->damage>victim->damagetolerance){ - if(id==0){ - bonus=cannon; - bonustime=0; - bonusvalue=100; - } - //} + award_bonus(id, cannon); } else if (victim->isCrouch()){ targetanimation=rabbitkickreversedanim; @@ -201,7 +172,7 @@ void Person::CatchFire(){ if(skeleton.free)flatvelocity=skeleton.joints[howmany].velocity; if(!skeleton.free)flatfacing=DoRotation(DoRotation(DoRotation(skeleton.joints[howmany].position,0,0,tilt),tilt2,0,0),0,rotation,0)*scale+coords; if(skeleton.free)flatfacing=skeleton.joints[howmany].position*scale+coords; - sprites.MakeSprite(flamesprite, flatfacing,flatvelocity, 1,1,1, 2, 1); + Sprite::MakeSprite(flamesprite, flatfacing,flatvelocity, 1,1,1, 2, 1); } onfiredelay=0.5; @@ -215,18 +186,18 @@ void Person::CatchFire(){ vel[1]=0; vel[2]=0; PlaySoundEx( firestartsound, samp[firestartsound], NULL, true); - FSOUND_3D_SetAttributes(channels[firestartsound], gLoc, vel); - FSOUND_SetVolume(channels[firestartsound], 256); - FSOUND_SetPaused(channels[firestartsound], false); + OPENAL_3D_SetAttributes(channels[firestartsound], gLoc, vel); + OPENAL_SetVolume(channels[firestartsound], 256); + OPENAL_SetPaused(channels[firestartsound], false); vel[0]=velocity.x; vel[1]=velocity.y; vel[2]=velocity.z; //PlaySoundEx( firesound, samp[firesound], NULL, true); - PlayStreamEx( stream_firesound, strm[stream_firesound], NULL, true); - FSOUND_3D_SetAttributes(channels[stream_firesound], gLoc, vel); - FSOUND_SetVolume(channels[stream_firesound], 256); - FSOUND_SetPaused(channels[stream_firesound], false); + PlayStreamEx( stream_firesound, samp[stream_firesound], NULL, true); + OPENAL_3D_SetAttributes(channels[stream_firesound], gLoc, vel); + OPENAL_SetVolume(channels[stream_firesound], 256); + OPENAL_SetPaused(channels[stream_firesound], false); flamedelay=0; @@ -386,32 +357,21 @@ bool Person::isWallJump(){ else return 0; } -void SolidHitBonus(); void SolidHitBonus(){ if(bonustime<1.5&&(bonus==fourxcombo||bonus==megacombo)){ - bonus=megacombo; - bonustime=0; - bonusvalue=160; + award_bonus(0, megacombo); } else if(bonustime<1.5&&bonus==threexcombo){ - bonus=fourxcombo; - bonustime=0; - bonusvalue=80; + award_bonus(0, fourxcombo); } else if(bonustime<1.5&&bonus==twoxcombo){ - bonus=threexcombo; - bonustime=0; - bonusvalue=40; + award_bonus(0, threexcombo); } else if(bonustime<1.5&&bonus==solidhit){ - bonus=twoxcombo; - bonustime=0; - bonusvalue=20; + award_bonus(0, twoxcombo); } else { - bonus=solidhit; - bonustime=0; - bonusvalue=10; + award_bonus(0, solidhit); } } @@ -434,36 +394,33 @@ void Person::DoBlood(float howmuch,int which){ if(skeleton.free)bloodvel+=DoRotation(skeleton.joints[skeleton.jointlabels[head]].velocity,((float)(Random()%100))/4,rotation+((float)(Random()%100))/4,0)*scale; if(!skeleton.free)bloodvel+=DoRotation(velocity,((float)(Random()%100))/4,((float)(Random()%100))/4,0)*scale; if(skeleton.free){ - sprites.MakeSprite(bloodsprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .05, 1); - sprites.MakeSprite(bloodflamesprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .3, 1); + Sprite::MakeSprite(bloodsprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .05, 1); + Sprite::MakeSprite(bloodflamesprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .3, 1); } if(!skeleton.free){ - sprites.MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1); - sprites.MakeSprite(bloodflamesprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .3, 1); + Sprite::MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1); + Sprite::MakeSprite(bloodflamesprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .3, 1); } } if(Random()%2==0) for(int i=0;i<3;i++){ if(Random()%2!=0){ bloodvel=0; - if(!skeleton.free){ + if(skeleton.free) { + bloodvel-=DoRotation(skeleton.forward*10*scale,((float)(Random()%100))/4,((float)(Random()%100))/4,0); + bloodvel+=DoRotation(skeleton.joints[skeleton.jointlabels[head]].velocity,((float)(Random()%100))/4,rotation+((float)(Random()%100))/4,0)*scale; + } else { bloodvel.z=10; bloodvel=DoRotation(bloodvel,((float)(Random()%100))/4,rotation+((float)(Random()%100))/4,0)*scale; + bloodvel+=DoRotation(velocity,((float)(Random()%100))/4,((float)(Random()%100))/4,0)*scale; } - if(skeleton.free){ - bloodvel-=DoRotation(skeleton.forward*10*scale,((float)(Random()%100))/4,((float)(Random()%100))/4,0); - } - if(skeleton.free)bloodvel+=DoRotation(skeleton.joints[skeleton.jointlabels[head]].velocity,((float)(Random()%100))/4,rotation+((float)(Random()%100))/4,0)*scale; - if(!skeleton.free)bloodvel+=DoRotation(velocity,((float)(Random()%100))/4,((float)(Random()%100))/4,0)*scale; bloodvel*=.2; if(skeleton.free){ - sprites.MakeSprite(splintersprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .05, 1); - sprites.special[sprites.numsprites-1]=3; - } - if(!skeleton.free){ - sprites.MakeSprite(splintersprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1); - sprites.special[sprites.numsprites-1]=3; + Sprite::MakeSprite(splintersprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .05, 1); + } else { + Sprite::MakeSprite(splintersprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1); } + Sprite::setLastSpriteSpecial(3); } } } @@ -477,16 +434,16 @@ void Person::DoBlood(float howmuch,int which){ bleedxint=abs(Random()%512); bleedyint=abs(Random()%512); } - if(creature==wolftype) - while(wolfbloodText[bleedxint*512*3+bleedyint*3+0]>which+4||wolfbloodText[bleedxint*512*3+bleedyint*3+0]500||bleedyint>500){ - bleedxint=abs(Random()%512); - bleedyint=abs(Random()%512); - } - bleedy=bleedxint; - bleedx=bleedyint; - bleedy/=realtexdetail; - bleedx/=realtexdetail; - direction=abs(Random()%2)*2-1; + if(creature==wolftype) + while(wolfbloodText[bleedxint*512*3+bleedyint*3+0]>which+4||wolfbloodText[bleedxint*512*3+bleedyint*3+0]500||bleedyint>500){ + bleedxint=abs(Random()%512); + bleedyint=abs(Random()%512); + } + bleedy=bleedxint; + bleedx=bleedyint; + bleedy/=realtexdetail; + bleedx/=realtexdetail; + direction=abs(Random()%2)*2-1; } } @@ -532,9 +489,9 @@ void Person::DoBloodBig(float howmuch,int which){ if(whichsound!=-1){ PlaySoundEx( whichsound, samp[whichsound], NULL, true); - FSOUND_3D_SetAttributes(channels[whichsound], gLoc, vel); - FSOUND_SetVolume(channels[whichsound], 512); - FSOUND_SetPaused(channels[whichsound], false); + OPENAL_3D_SetAttributes(channels[whichsound], gLoc, vel); + OPENAL_SetVolume(channels[whichsound], 512); + OPENAL_SetPaused(channels[whichsound], false); } } @@ -561,12 +518,12 @@ void Person::DoBloodBig(float howmuch,int which){ if(skeleton.free)bloodvel+=DoRotation(skeleton.joints[skeleton.jointlabels[head]].velocity,((float)(Random()%100))/4,rotation+((float)(Random()%100))/4,0)*scale; if(!skeleton.free)bloodvel+=DoRotation(velocity,((float)(Random()%100))/4,((float)(Random()%100))/4,0)*scale; if(skeleton.free){ - sprites.MakeSprite(bloodsprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .05, 1); - sprites.MakeSprite(bloodflamesprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .3, 1); + Sprite::MakeSprite(bloodsprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .05, 1); + Sprite::MakeSprite(bloodflamesprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .3, 1); } if(!skeleton.free){ - sprites.MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1); - sprites.MakeSprite(bloodflamesprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .3, 1); + Sprite::MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1); + Sprite::MakeSprite(bloodflamesprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .3, 1); } } } @@ -788,12 +745,12 @@ bool Person::DoBloodBigWhere(float howmuch,int which, XYZ where){ if(skeleton.free)bloodvel+=DoRotation(skeleton.joints[skeleton.jointlabels[head]].velocity,((float)(Random()%100))/4,rotation+((float)(Random()%100))/4,0)*scale; if(!skeleton.free)bloodvel+=DoRotation(velocity,((float)(Random()%100))/4,((float)(Random()%100))/4,0)*scale; if(skeleton.free){ - sprites.MakeSprite(bloodsprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .05, 1); - sprites.MakeSprite(bloodflamesprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .3, 1); + Sprite::MakeSprite(bloodsprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .05, 1); + Sprite::MakeSprite(bloodflamesprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .3, 1); } if(!skeleton.free){ - sprites.MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1); - sprites.MakeSprite(bloodflamesprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .3, 1); + Sprite::MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1); + Sprite::MakeSprite(bloodflamesprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .3, 1); } } } @@ -1185,15 +1142,15 @@ void Person::Reverse(){ if(weapons.type[weaponids[0]]==staff)weapons.damage[weaponids[0]]+=.2+float(abs(Random()%100)-50)/250; PlaySoundEx( swordstaffsound, samp[swordstaffsound], NULL, true); - FSOUND_3D_SetAttributes(channels[swordstaffsound], gLoc, vel); - FSOUND_SetVolume(channels[swordstaffsound], 512); - FSOUND_SetPaused(channels[swordstaffsound], false); + OPENAL_3D_SetAttributes(channels[swordstaffsound], gLoc, vel); + OPENAL_SetVolume(channels[swordstaffsound], 512); + OPENAL_SetPaused(channels[swordstaffsound], false); } else{ PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, true); - FSOUND_3D_SetAttributes(channels[metalhitsound], gLoc, vel); - FSOUND_SetVolume(channels[metalhitsound], 512); - FSOUND_SetPaused(channels[metalhitsound], false); + OPENAL_3D_SetAttributes(channels[metalhitsound], gLoc, vel); + OPENAL_SetVolume(channels[metalhitsound], 512); + OPENAL_SetPaused(channels[metalhitsound], false); } } XYZ aim; @@ -1228,9 +1185,9 @@ void Person::Reverse(){ /*PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, true); - FSOUND_3D_SetAttributes(channels[metalhitsound], gLoc, vel); - FSOUND_SetVolume(channels[metalhitsound], 512); - FSOUND_SetPaused(channels[metalhitsound], false);*/ + OPENAL_3D_SetAttributes(channels[metalhitsound], gLoc, vel); + OPENAL_SetVolume(channels[metalhitsound], 512); + OPENAL_SetPaused(channels[metalhitsound], false);*/ } if(abs(Random()%20)==0){ @@ -1248,15 +1205,15 @@ void Person::Reverse(){ if(weapons.type[weaponids[0]]==staff)weapons.damage[weaponids[0]]+=.2+float(abs(Random()%100)-50)/250; PlaySoundEx( swordstaffsound, samp[swordstaffsound], NULL, true); - FSOUND_3D_SetAttributes(channels[swordstaffsound], gLoc, vel); - FSOUND_SetVolume(channels[swordstaffsound], 512); - FSOUND_SetPaused(channels[swordstaffsound], false); + OPENAL_3D_SetAttributes(channels[swordstaffsound], gLoc, vel); + OPENAL_SetVolume(channels[swordstaffsound], 512); + OPENAL_SetPaused(channels[swordstaffsound], false); } else{ PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, true); - FSOUND_3D_SetAttributes(channels[metalhitsound], gLoc, vel); - FSOUND_SetVolume(channels[metalhitsound], 512); - FSOUND_SetPaused(channels[metalhitsound], false); + OPENAL_3D_SetAttributes(channels[metalhitsound], gLoc, vel); + OPENAL_SetVolume(channels[metalhitsound], 512); + OPENAL_SetPaused(channels[metalhitsound], false); } } @@ -1289,9 +1246,9 @@ void Person::Reverse(){ /*PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, true); - FSOUND_3D_SetAttributes(channels[metalhitsound], gLoc, vel); - FSOUND_SetVolume(channels[metalhitsound], 512); - FSOUND_SetPaused(channels[metalhitsound], false);*/ + OPENAL_3D_SetAttributes(channels[metalhitsound], gLoc, vel); + OPENAL_SetVolume(channels[metalhitsound], 512); + OPENAL_SetPaused(channels[metalhitsound], false);*/ } } if(hasvictim) @@ -1384,9 +1341,9 @@ void Person::DoDamage(float howmuch){ flatvelocity2.x+=(float)(abs(Random()%100)-50)/10; flatvelocity2.y+=(float)(abs(Random()%100)-50)/10; flatvelocity2.z+=(float)(abs(Random()%100)-50)/10; - sprites.MakeSprite(bloodflamesprite, flatfacing2,flatvelocity2, 1,1,1, 3, 1); - sprites.MakeSprite(bloodsprite, flatfacing2,flatvelocity2, 1,1,1, .4, 1); - sprites.MakeSprite(cloudsprite, flatfacing2,flatvelocity2*0, .6,0,0, 1, .5); + Sprite::MakeSprite(bloodflamesprite, flatfacing2,flatvelocity2, 1,1,1, 3, 1); + Sprite::MakeSprite(bloodsprite, flatfacing2,flatvelocity2, 1,1,1, .4, 1); + Sprite::MakeSprite(cloudsprite, flatfacing2,flatvelocity2*0, .6,0,0, 1, .5); } float gLoc[3]; @@ -1398,9 +1355,9 @@ void Person::DoDamage(float howmuch){ vel[1]=0; vel[2]=0; PlaySoundEx( splattersound, samp[splattersound], NULL, true); - FSOUND_3D_SetAttributes(channels[splattersound], gLoc, vel); - FSOUND_SetVolume(channels[splattersound], 256); - FSOUND_SetPaused(channels[splattersound], false); + OPENAL_3D_SetAttributes(channels[splattersound], gLoc, vel); + OPENAL_SetVolume(channels[splattersound], 256); + OPENAL_SetPaused(channels[splattersound], false); skeleton.free=2; DoDamage(10000); @@ -1410,9 +1367,7 @@ void Person::DoDamage(float howmuch){ slomodelay=.2; }*/ if(!dead&&creature==wolftype){ - bonus=Wolfbonus; - bonustime=0; - bonusvalue=300; + award_bonus(0, Wolfbonus); } dead=2; coords=20; @@ -1452,9 +1407,9 @@ void Person::DoDamage(float howmuch){ if(whichsound!=-1){ PlaySoundEx( whichsound, samp[whichsound], NULL, true); - FSOUND_3D_SetAttributes(channels[whichsound], gLoc, vel); - FSOUND_SetVolume(channels[whichsound], 512); - FSOUND_SetPaused(channels[whichsound], false); + OPENAL_3D_SetAttributes(channels[whichsound], gLoc, vel); + OPENAL_SetVolume(channels[whichsound], 512); + OPENAL_SetPaused(channels[whichsound], false); } } speechdelay=.3; @@ -1468,7 +1423,7 @@ void Person::DoHead(){ static XYZ facing; static float lookspeed=500; - if(!freeze&&!winfreeze&&(!mainmenu||!gamestarted)){ + if(!freeze&&!winfreeze){ //head facing targetheadrotation=(float)((int)((0-rotation-targetheadrotation+180)*100)%36000)/100; @@ -1706,7 +1661,7 @@ void Person::FootLand(int which, float opacity){ if(which==0)footpoint=DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,rotation,0)*scale+coords; if(which==1)footpoint=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,rotation,0)*scale+coords; //footpoint.y=coords.y; - if(findDistancefast(&footpoint,&viewer))sprites.MakeSprite(cloudsprite, footpoint,footvel, 1,1,1, .5, .2*opacity); + if(findDistancefast(&footpoint,&viewer))Sprite::MakeSprite(cloudsprite, footpoint,footvel, 1,1,1, .5, .2*opacity); } else if(environment==snowyenvironment&&onterrain&&terrain.getOpacity(coords.x,coords.z)<.2){ footvel=velocity/5; @@ -1715,7 +1670,7 @@ void Person::FootLand(int which, float opacity){ if(which==1)footpoint=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,rotation,0)*scale+coords; footpoint.y=terrain.getHeight(footpoint.x,footpoint.z); terrainlight=terrain.getLighting(footpoint.x,footpoint.z); - if(findDistancefast(&footpoint,&viewer)=1||detail==2)if(detail==2)if(findDistancefast(&footpoint,&viewer)=1||detail==2)if(detail==2)if(findDistancefast(&footpoint,&viewer)distancemax){ -distancemax=findDistancefast(average,skeleton.joints[j].position); -} -} -distancemax=fast_sqrt(distancemax); -//Collide with player -if(skeleton.free<1){ -start=start-coords; -end=end-coords; -if(rotation)start=DoRotation(start,0,-rotation,0); -if(rotation)end=DoRotation(end,0,-rotation,0); -} -tempbulletloc[0]=start; -tempbulletloc[1]=end; -if(sphere_line_intersection(tempbulletloc[0].x,tempbulletloc[0].y,tempbulletloc[0].z, -tempbulletloc[1].x,tempbulletloc[1].y,tempbulletloc[1].z, -average.x, average.y, average.z, distancemax)){ -for(int j=0;jposition.x)/2), -(-(skeleton.joints[j].position.y+skeleton.joints[j].parent->position.y)/2), -(-(skeleton.joints[j].position.z+skeleton.joints[j].parent->position.z)/2)); -glTranslatef(tempbulletloc[0].x,tempbulletloc[0].y,tempbulletloc[0].z); -glGetFloatv(GL_MODELVIEW_MATRIX,M); -tempbulletloc[0].x=M[12]; -tempbulletloc[0].y=M[13]; -tempbulletloc[0].z=M[14]; -glPopMatrix(); -glPushMatrix(); -glLoadIdentity(); -glScalef(1,1/skeleton.joints[j].length,1); -glRotatef(skeleton.joints[j].rotate2-90,0,0,1); -glRotatef(skeleton.joints[j].rotate1-90,0,1,0); -glTranslatef( (-(skeleton.joints[j].position.x+skeleton.joints[j].parent->position.x)/2), -(-(skeleton.joints[j].position.y+skeleton.joints[j].parent->position.y)/2), -(-(skeleton.joints[j].position.z+skeleton.joints[j].parent->position.z)/2)); -glTranslatef(tempbulletloc[1].x,tempbulletloc[1].y,tempbulletloc[1].z); -glGetFloatv(GL_MODELVIEW_MATRIX,M); -tempbulletloc[1].x=M[12]; -tempbulletloc[1].y=M[13]; -tempbulletloc[1].z=M[14]; -glPopMatrix(); -collide=skeletonmodels[skeleton.joints[j].modelnum].LineCheck(tempbulletloc[0],tempbulletloc[1],&collisionpoint); -if(collide!=-1) -{ -glPushMatrix(); -glLoadIdentity(); -glTranslatef( (skeleton.joints[j].position.x+skeleton.joints[j].parent->position.x)/2, -(skeleton.joints[j].position.y+skeleton.joints[j].parent->position.y)/2, -(skeleton.joints[j].position.z+skeleton.joints[j].parent->position.z)/2); -glRotatef(-skeleton.joints[j].rotate1+90,0,1,0); -glRotatef(-skeleton.joints[j].rotate2+90,0,0,1); -glScalef(1,skeleton.joints[j].length,1); -glTranslatef(collisionpoint.x,collisionpoint.y,collisionpoint.z); -glGetFloatv(GL_MODELVIEW_MATRIX,M); -collisionpoint.x=M[12]; -collisionpoint.y=M[13]; -collisionpoint.z=M[14]; -glPopMatrix(); -hitstruct.collision=1; -hitstruct.hitlocation=collisionpoint; -hitstruct.joint1=&skeleton.joints[j]; -hitstruct.joint2=skeleton.joints[j].parent; -} -} -} -for(int j=0;jposition.x+skeleton.muscles[j].parent2->position.x)/2), -(-(skeleton.muscles[j].parent1->position.y+skeleton.muscles[j].parent2->position.y)/2), -(-(skeleton.muscles[j].parent1->position.z+skeleton.muscles[j].parent2->position.z)/2)); - -glTranslatef(tempbulletloc[0].x,tempbulletloc[0].y,tempbulletloc[0].z); -glGetFloatv(GL_MODELVIEW_MATRIX,M); -tempbulletloc[0].x=M[12]; -tempbulletloc[0].y=M[13]; -tempbulletloc[0].z=M[14]; -glPopMatrix(); -glPushMatrix(); -glLoadIdentity(); -glScalef(1,1/skeleton.muscles[j].length,1); -glRotatef(skeleton.muscles[j].rotate3,0,1,0); -glRotatef(skeleton.muscles[j].rotate2-90,0,0,1); -glRotatef(skeleton.muscles[j].rotate1-90,0,1,0); - -glTranslatef( (-(skeleton.muscles[j].parent1->position.x+skeleton.muscles[j].parent2->position.x)/2), -(-(skeleton.muscles[j].parent1->position.y+skeleton.muscles[j].parent2->position.y)/2), -(-(skeleton.muscles[j].parent1->position.z+skeleton.muscles[j].parent2->position.z)/2)); -glTranslatef(tempbulletloc[1].x,tempbulletloc[1].y,tempbulletloc[1].z); -glGetFloatv(GL_MODELVIEW_MATRIX,M); -tempbulletloc[1].x=M[12]; -tempbulletloc[1].y=M[13]; -tempbulletloc[1].z=M[14]; -glPopMatrix(); -collide=skeletonmodels[skeleton.muscles[j].parent1->modelnum].LineCheck(tempbulletloc[0],tempbulletloc[1],&collisionpoint); -if(collide!=-1) -{ -glPushMatrix(); -glLoadIdentity(); -glTranslatef( (skeleton.muscles[j].parent1->position.x+skeleton.muscles[j].parent2->position.x)/2, -(skeleton.muscles[j].parent1->position.y+skeleton.muscles[j].parent2->position.y)/2, -(skeleton.muscles[j].parent1->position.z+skeleton.muscles[j].parent2->position.z)/2); -glRotatef(-skeleton.muscles[j].rotate1+90,0,1,0); -glRotatef(-skeleton.muscles[j].rotate2+90,0,0,1); -glRotatef(-skeleton.muscles[j].rotate3,0,1,0); -glScalef(1,findDistance(skeleton.muscles[j].parent1->position,skeleton.muscles[j].parent2->position),1); -glTranslatef(collisionpoint.x,collisionpoint.y,collisionpoint.z); -glGetFloatv(GL_MODELVIEW_MATRIX,M); -collisionpoint.x=M[12]; -collisionpoint.y=M[13]; -collisionpoint.z=M[14]; -glPopMatrix(); -hitstruct.collision=1; -hitstruct.hitlocation=collisionpoint; -hitstruct.joint1=skeleton.muscles[j].parent1; -hitstruct.joint2=skeleton.muscles[j].parent2; -} -} -} -} -if(skeleton.free<1){ -if(rotation)hitstruct.hitlocation=DoRotation(hitstruct.hitlocation,0,rotation,0); -hitstruct.hitlocation=hitstruct.hitlocation+coords; -} -return hitstruct; -} -*/ void Person::DoAnimations(){ if(!skeleton.free){ int i = 0; @@ -1947,8 +1733,8 @@ void Person::DoAnimations(){ vel[2]=velocity.z; if(id==0){ - FSOUND_3D_SetAttributes(channels[whooshsound], gLoc, vel); - FSOUND_SetVolume(channels[whooshsound], 64*findLength(&velocity)/5); + OPENAL_3D_SetAttributes(channels[whooshsound], gLoc, vel); + OPENAL_SetVolume(channels[whooshsound], 64*findLength(&velocity)/5); } if(((velocity.y<-15)||(crouchkeydown&&velocity.y<-8))&&abs(velocity.y)*4>fast_sqrt(velocity.x*velocity.x*velocity.z*velocity.z))landhard=1; if(!crouchkeydown&&velocity.y>=-15)landhard=0; @@ -1997,10 +1783,10 @@ void Person::DoAnimations(){ vel[1]=0; vel[2]=0; PlaySoundEx( fireendsound, samp[fireendsound], NULL, true); - FSOUND_3D_SetAttributes(channels[fireendsound], gLoc, vel); - FSOUND_SetVolume(channels[fireendsound], 256); - FSOUND_SetPaused(channels[fireendsound], false); - FSOUND_SetPaused(channels[stream_firesound], true); + OPENAL_3D_SetAttributes(channels[fireendsound], gLoc, vel); + OPENAL_SetVolume(channels[fireendsound], 256); + OPENAL_SetPaused(channels[fireendsound], false); + OPENAL_SetPaused(channels[stream_firesound], true); deathbleeding=0; } @@ -2027,16 +1813,14 @@ void Person::DoAnimations(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, true); - FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel); - FSOUND_SetVolume(channels[clawslicesound], 128); - FSOUND_SetPaused(channels[clawslicesound], false); + OPENAL_3D_SetAttributes(channels[clawslicesound], gLoc, vel); + OPENAL_SetVolume(channels[clawslicesound], 128); + OPENAL_SetPaused(channels[clawslicesound], false); victim->spurt=1; victim->DoBloodBig(1/victim->armorhead,210); } + award_bonus(id, TackleBonus); if(id==0){ - bonus=TackleBonus; - bonustime=0; - bonusvalue=5; if(victim->aitype==gethelptype)bonusvalue=50; } } @@ -2058,9 +1842,9 @@ void Person::DoAnimations(){ vel[2]=velocity.z; PlaySoundEx( knifesheathesound, samp[knifesheathesound], NULL, true); - FSOUND_3D_SetAttributes(channels[knifesheathesound], gLoc, vel); - FSOUND_SetVolume(channels[knifesheathesound], 128); - FSOUND_SetPaused(channels[knifesheathesound], false); + OPENAL_3D_SetAttributes(channels[knifesheathesound], gLoc, vel); + OPENAL_SetVolume(channels[knifesheathesound], 128); + OPENAL_SetPaused(channels[knifesheathesound], false); } if(weaponactive!=-1){ float gLoc[3]; @@ -2073,9 +1857,9 @@ void Person::DoAnimations(){ vel[2]=velocity.z; PlaySoundEx( knifedrawsound, samp[knifedrawsound], NULL, true); - FSOUND_3D_SetAttributes(channels[knifedrawsound], gLoc, vel); - FSOUND_SetVolume(channels[knifedrawsound], 128); - FSOUND_SetPaused(channels[knifedrawsound], false); + OPENAL_3D_SetAttributes(channels[knifedrawsound], gLoc, vel); + OPENAL_SetVolume(channels[knifedrawsound], 128); + OPENAL_SetPaused(channels[knifedrawsound], false); } } drawtogglekeydown=1; @@ -2126,11 +1910,11 @@ void Person::DoAnimations(){ if(animation[targetanimation].label[targetframe]==8&&tutoriallevel!=1)whichsound=landsound2; PlaySoundEx( whichsound, samp[whichsound], NULL, true); - FSOUND_3D_SetAttributes(channels[whichsound], gLoc, vel); - if(whichsound!=knifeswishsound)FSOUND_SetVolume(channels[whichsound], 128); - if(whichsound!=knifeswishsound&&(targetanimation==staffhitanim||targetanimation==staffgroundsmashanim||targetanimation==staffspinhitanim))FSOUND_SetVolume(channels[whichsound], 256); - if(whichsound==knifeswishsound)FSOUND_SetVolume(channels[whichsound], 512); - FSOUND_SetPaused(channels[whichsound], false); + 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); if(id==0) if(whichsound==footstepsound||whichsound==footstepsound2||whichsound==footstepsound3||whichsound==footstepsound4){ @@ -2144,9 +1928,9 @@ void Person::DoAnimations(){ if(animation[targetanimation].label[targetframe]==3){ whichsound--; PlaySoundEx( whichsound, samp[whichsound], NULL, true); - FSOUND_3D_SetAttributes(channels[whichsound], gLoc, vel); - FSOUND_SetVolume(channels[whichsound], 128); - FSOUND_SetPaused(channels[whichsound], false); + OPENAL_3D_SetAttributes(channels[whichsound], gLoc, vel); + OPENAL_SetVolume(channels[whichsound], 128); + OPENAL_SetPaused(channels[whichsound], false); } } @@ -2188,9 +1972,9 @@ void Person::DoAnimations(){ if(whichsound!=-1){ PlaySoundEx( whichsound, samp[whichsound], NULL, true); - FSOUND_3D_SetAttributes(channels[whichsound], gLoc, vel); - FSOUND_SetVolume(channels[whichsound], 512); - FSOUND_SetPaused(channels[whichsound], false); + OPENAL_3D_SetAttributes(channels[whichsound], gLoc, vel); + OPENAL_SetVolume(channels[whichsound], 512); + OPENAL_SetPaused(channels[whichsound], false); } } @@ -2222,9 +2006,9 @@ void Person::DoAnimations(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( knifedrawsound, samp[knifedrawsound], NULL, true); - FSOUND_3D_SetAttributes(channels[knifedrawsound], gLoc, vel); - FSOUND_SetVolume(channels[knifedrawsound], 128); - FSOUND_SetPaused(channels[knifedrawsound], false); + OPENAL_3D_SetAttributes(channels[knifedrawsound], gLoc, vel); + OPENAL_SetVolume(channels[knifedrawsound], 128); + OPENAL_SetPaused(channels[knifedrawsound], false); } weaponactive=0; @@ -2268,16 +2052,16 @@ void Person::DoAnimations(){ if(!fleshstuck){ if(weapons.type[i]!=staff){ PlaySoundEx( knifedrawsound, samp[knifedrawsound], NULL, true); - FSOUND_3D_SetAttributes(channels[knifedrawsound], gLoc, vel); - FSOUND_SetVolume(channels[knifedrawsound], 128); - FSOUND_SetPaused(channels[knifedrawsound], false); + 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); - FSOUND_3D_SetAttributes(channels[fleshstabremovesound], gLoc, vel); - FSOUND_SetVolume(channels[fleshstabremovesound], 128); - FSOUND_SetPaused(channels[fleshstabremovesound], false); + OPENAL_3D_SetAttributes(channels[fleshstabremovesound], gLoc, vel); + OPENAL_SetVolume(channels[fleshstabremovesound], 128); + OPENAL_SetPaused(channels[fleshstabremovesound], false); } weaponactive=0; if(weapons.owner[i]!=-1){ @@ -2305,7 +2089,7 @@ void Person::DoAnimations(){ footpoint=weapons.position[i]; if(victim->weaponstuck!=-1){ if(victim->weaponids[victim->weaponstuck]==i){ - if(bloodtoggle)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .8, .3); + if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .8, .3); weapons.bloody[i]=2; weapons.blooddrip[i]=5; victim->weaponstuck=-1; @@ -2355,9 +2139,9 @@ void Person::DoAnimations(){ vel[2]=velocity.z; PlaySoundEx( knifesheathesound, samp[knifesheathesound], NULL, true); - FSOUND_3D_SetAttributes(channels[knifesheathesound], gLoc, vel); - FSOUND_SetVolume(channels[knifesheathesound], 128); - FSOUND_SetPaused(channels[knifesheathesound], false); + OPENAL_3D_SetAttributes(channels[knifesheathesound], gLoc, vel); + OPENAL_SetVolume(channels[knifesheathesound], 128); + OPENAL_SetPaused(channels[knifesheathesound], false); } if(weaponactive!=-1){ float gLoc[3]; @@ -2370,9 +2154,9 @@ void Person::DoAnimations(){ vel[2]=velocity.z; PlaySoundEx( knifedrawsound, samp[knifedrawsound], NULL, true); - FSOUND_3D_SetAttributes(channels[knifedrawsound], gLoc, vel); - FSOUND_SetVolume(channels[knifedrawsound], 128); - FSOUND_SetPaused(channels[knifedrawsound], false); + OPENAL_3D_SetAttributes(channels[knifedrawsound], gLoc, vel); + OPENAL_SetVolume(channels[knifedrawsound], 128); + OPENAL_SetPaused(channels[knifedrawsound], false); } } @@ -2407,9 +2191,9 @@ void Person::DoAnimations(){ vel[2]=velocity.z; PlaySoundEx( jumpsound, samp[jumpsound], NULL, true); - FSOUND_3D_SetAttributes(channels[jumpsound], gLoc, vel); - FSOUND_SetVolume(channels[jumpsound], 128); - FSOUND_SetPaused(channels[jumpsound], false); + OPENAL_3D_SetAttributes(channels[jumpsound], gLoc, vel); + OPENAL_SetVolume(channels[jumpsound], 128); + OPENAL_SetPaused(channels[jumpsound], false); } float closestdist; @@ -2455,9 +2239,9 @@ void Person::DoAnimations(){ vel[2]=velocity.z; PlaySoundEx( jumpsound, samp[jumpsound], NULL, true); - FSOUND_3D_SetAttributes(channels[jumpsound], gLoc, vel); - FSOUND_SetVolume(channels[jumpsound], 128); - FSOUND_SetPaused(channels[jumpsound], false); + OPENAL_3D_SetAttributes(channels[jumpsound], gLoc, vel); + OPENAL_SetVolume(channels[jumpsound], 128); + OPENAL_SetPaused(channels[jumpsound], false); } } } @@ -2487,15 +2271,15 @@ void Person::DoAnimations(){ vel[2]=velocity.z; if(tutoriallevel!=1){ PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, true); - FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); - FSOUND_SetVolume(channels[heavyimpactsound], 128); - FSOUND_SetPaused(channels[heavyimpactsound], false); + OPENAL_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); + OPENAL_SetVolume(channels[heavyimpactsound], 128); + OPENAL_SetPaused(channels[heavyimpactsound], false); } if(creature==wolftype){ PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, true); - FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel); - FSOUND_SetVolume(channels[clawslicesound], 128); - FSOUND_SetPaused(channels[clawslicesound], false); + OPENAL_3D_SetAttributes(channels[clawslicesound], gLoc, vel); + OPENAL_SetVolume(channels[clawslicesound], 128); + OPENAL_SetPaused(channels[clawslicesound], false); victim->spurt=1; victim->DoBloodBig(2/victim->armorhead,175); } @@ -2536,14 +2320,14 @@ void Person::DoAnimations(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( whooshhitsound, samp[whooshhitsound], NULL, true); - FSOUND_3D_SetAttributes(channels[whooshhitsound], gLoc, vel); - FSOUND_SetVolume(channels[whooshhitsound], 512); - FSOUND_SetPaused(channels[whooshhitsound], false); + OPENAL_3D_SetAttributes(channels[whooshhitsound], gLoc, vel); + OPENAL_SetVolume(channels[whooshhitsound], 512); + OPENAL_SetPaused(channels[whooshhitsound], false); if(creature==wolftype){ PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, true); - FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel); - FSOUND_SetVolume(channels[clawslicesound], 128); - FSOUND_SetPaused(channels[clawslicesound], false); + OPENAL_3D_SetAttributes(channels[clawslicesound], gLoc, vel); + OPENAL_SetVolume(channels[clawslicesound], 128); + OPENAL_SetPaused(channels[clawslicesound], false); victim->spurt=1; victim->DoBloodBig(2,175); } @@ -2581,15 +2365,15 @@ void Person::DoAnimations(){ vel[2]=velocity.z; if(tutoriallevel!=1){ PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, true); - FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); - FSOUND_SetVolume(channels[heavyimpactsound], 160); - FSOUND_SetPaused(channels[heavyimpactsound], false); + OPENAL_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); + OPENAL_SetVolume(channels[heavyimpactsound], 160); + OPENAL_SetPaused(channels[heavyimpactsound], false); } if(creature==wolftype){ PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, true); - FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel); - FSOUND_SetVolume(channels[clawslicesound], 128); - FSOUND_SetPaused(channels[clawslicesound], false); + OPENAL_3D_SetAttributes(channels[clawslicesound], gLoc, vel); + OPENAL_SetVolume(channels[clawslicesound], 128); + OPENAL_SetPaused(channels[clawslicesound], false); victim->spurt=1; victim->DoBloodBig(2/victim->armorhead,175); } @@ -2608,11 +2392,7 @@ void Person::DoAnimations(){ victim->DoDamage(damagemult*150/victim->protectionhead); if(victim->damage>victim->damagetolerance){ - if(id==0){ - bonus=style; - bonustime=0; - bonusvalue=150; - } + award_bonus(id, style); } else if(id==0){ SolidHitBonus(); @@ -2636,15 +2416,15 @@ void Person::DoAnimations(){ vel[2]=velocity.z; if(tutoriallevel!=1){ PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, true); - FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); - FSOUND_SetVolume(channels[heavyimpactsound], 160); - FSOUND_SetPaused(channels[heavyimpactsound], false); + OPENAL_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); + OPENAL_SetVolume(channels[heavyimpactsound], 160); + OPENAL_SetPaused(channels[heavyimpactsound], false); } if(creature==wolftype){ PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, true); - FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel); - FSOUND_SetVolume(channels[clawslicesound], 128); - FSOUND_SetPaused(channels[clawslicesound], false); + OPENAL_3D_SetAttributes(channels[clawslicesound], gLoc, vel); + OPENAL_SetVolume(channels[clawslicesound], 128); + OPENAL_SetPaused(channels[clawslicesound], false); victim->spurt=1; victim->DoBloodBig(2/victim->armorhead,175); } @@ -2663,11 +2443,7 @@ void Person::DoAnimations(){ victim->DoDamage(damagemult*150/victim->protectionhead); if(victim->damage>victim->damagetolerance){ - if(id==0){ - bonus=style; - bonustime=0; - bonusvalue=150; - } + award_bonus(id, style); } else if(id==0){ SolidHitBonus(); @@ -2692,9 +2468,9 @@ void Person::DoAnimations(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( whooshhitsound, samp[whooshhitsound], NULL, true); - FSOUND_3D_SetAttributes(channels[whooshhitsound], gLoc, vel); - FSOUND_SetVolume(channels[whooshhitsound], 512); - FSOUND_SetPaused(channels[whooshhitsound], false); + OPENAL_3D_SetAttributes(channels[whooshhitsound], gLoc, vel); + OPENAL_SetVolume(channels[whooshhitsound], 512); + OPENAL_SetPaused(channels[whooshhitsound], false); victim->RagDoll(0); XYZ relative; relative=victim->coords-coords; @@ -2723,14 +2499,14 @@ void Person::DoAnimations(){ vel[1]=velocity.y; vel[2]=velocity.z; /*PlaySoundEx( landsound2, samp[landsound2], NULL, true); - FSOUND_3D_SetAttributes(channels[landsound2], gLoc, vel); - FSOUND_SetVolume(channels[landsound2], 128); - FSOUND_SetPaused(channels[landsound2], false); + OPENAL_3D_SetAttributes(channels[landsound2], gLoc, vel); + OPENAL_SetVolume(channels[landsound2], 128); + OPENAL_SetPaused(channels[landsound2], false); */ PlaySoundEx( movewhooshsound, samp[movewhooshsound], NULL, true); - FSOUND_3D_SetAttributes(channels[movewhooshsound], gLoc, vel); - FSOUND_SetVolume(channels[movewhooshsound], 128); - FSOUND_SetPaused(channels[movewhooshsound], false); + OPENAL_3D_SetAttributes(channels[movewhooshsound], gLoc, vel); + OPENAL_SetVolume(channels[movewhooshsound], 128); + OPENAL_SetPaused(channels[movewhooshsound], false); victim->skeleton.longdead=0; victim->skeleton.free=1; @@ -2773,9 +2549,9 @@ void Person::DoAnimations(){ vel[2]=velocity.z; if(tutoriallevel!=1){ PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, true); - FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); - FSOUND_SetVolume(channels[heavyimpactsound], 128); - FSOUND_SetPaused(channels[heavyimpactsound], false); + OPENAL_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); + OPENAL_SetVolume(channels[heavyimpactsound], 128); + OPENAL_SetPaused(channels[heavyimpactsound], false); } XYZ relative; relative=victim->coords-coords; @@ -2808,9 +2584,9 @@ void Person::DoAnimations(){ vel[2]=velocity.z; if(tutoriallevel!=1){ PlaySoundEx( thudsound, samp[thudsound], NULL, true); - FSOUND_3D_SetAttributes(channels[thudsound], gLoc, vel); - FSOUND_SetVolume(channels[thudsound], 400); - FSOUND_SetPaused(channels[thudsound], false); + OPENAL_3D_SetAttributes(channels[thudsound], gLoc, vel); + OPENAL_SetVolume(channels[thudsound], 400); + OPENAL_SetPaused(channels[thudsound], false); } victim->skeleton.longdead=0; @@ -2863,9 +2639,9 @@ void Person::DoAnimations(){ if(!hasvictim){ terrain.MakeDecal(blooddecalfast,(weapons.tippoint[weaponids[weaponactive]]*.8+weapons.position[weaponids[weaponactive]]*.2),.08,.6,Random()%360); PlaySoundEx( knifesheathesound, samp[knifesheathesound], NULL, true); - FSOUND_3D_SetAttributes(channels[knifesheathesound], gLoc, vel); - FSOUND_SetVolume(channels[knifesheathesound], 128); - FSOUND_SetPaused(channels[knifesheathesound], false); + OPENAL_3D_SetAttributes(channels[knifesheathesound], gLoc, vel); + OPENAL_SetVolume(channels[knifesheathesound], 128); + OPENAL_SetPaused(channels[knifesheathesound], false); } if(victim&&hasvictim){ @@ -2911,11 +2687,8 @@ void Person::DoAnimations(){ if(whichtri!=-1){ if(victim->dead!=2){ victim->DoDamage(abs((victim->damagetolerance-victim->permanentdamage)*2)); - if(id==0&&!victim->dead){ - bonus=FinishedBonus; - bonustime=0; - bonusvalue=200; - } + if (!victim->dead) + award_bonus(id, FinishedBonus); } if(bloodtoggle)weapons.bloody[weaponids[weaponactive]]=2; @@ -2929,9 +2702,9 @@ void Person::DoAnimations(){ //victim->skeleton.joints[i].velocity=0; } PlaySoundEx( fleshstabsound, samp[fleshstabsound], NULL, true); - FSOUND_3D_SetAttributes(channels[fleshstabsound], gLoc, vel); - FSOUND_SetVolume(channels[fleshstabsound], 128); - FSOUND_SetPaused(channels[fleshstabsound], false); + OPENAL_3D_SetAttributes(channels[fleshstabsound], gLoc, vel); + OPENAL_SetVolume(channels[fleshstabsound], 128); + OPENAL_SetPaused(channels[fleshstabsound], false); } if(whichtri!=-1||weapons.bloody[weaponids[weaponactive]]){ @@ -2941,9 +2714,9 @@ void Person::DoAnimations(){ if(whichtri==-1){ hasvictim=0; PlaySoundEx( knifesheathesound, samp[knifesheathesound], NULL, true); - FSOUND_3D_SetAttributes(channels[knifesheathesound], gLoc, vel); - FSOUND_SetVolume(channels[knifesheathesound], 128); - FSOUND_SetPaused(channels[knifesheathesound], false); + OPENAL_3D_SetAttributes(channels[knifesheathesound], gLoc, vel); + OPENAL_SetVolume(channels[knifesheathesound], 128); + OPENAL_SetPaused(channels[knifesheathesound], false); } } } @@ -2962,18 +2735,18 @@ void Person::DoAnimations(){ vel[2]=velocity.z; if(!hasvictim){ PlaySoundEx( knifedrawsound, samp[knifedrawsound], NULL, true); - FSOUND_3D_SetAttributes(channels[knifedrawsound], gLoc, vel); - FSOUND_SetVolume(channels[knifedrawsound], 128); - FSOUND_SetPaused(channels[knifedrawsound], false); + OPENAL_3D_SetAttributes(channels[knifedrawsound], gLoc, vel); + OPENAL_SetVolume(channels[knifedrawsound], 128); + OPENAL_SetPaused(channels[knifedrawsound], false); } if(victim&&hasvictim){ XYZ footvel,footpoint; PlaySoundEx( fleshstabremovesound, samp[fleshstabremovesound], NULL, true); - FSOUND_3D_SetAttributes(channels[fleshstabremovesound], gLoc, vel); - FSOUND_SetVolume(channels[fleshstabremovesound], 128); - FSOUND_SetPaused(channels[fleshstabremovesound], false); + OPENAL_3D_SetAttributes(channels[fleshstabremovesound], gLoc, vel); + OPENAL_SetVolume(channels[fleshstabremovesound], 128); + OPENAL_SetPaused(channels[fleshstabremovesound], false); footvel=0; footpoint=(weapons.tippoint[weaponids[weaponactive]]*.8+weapons.position[weaponids[weaponactive]]*.2); @@ -3042,7 +2815,7 @@ void Person::DoAnimations(){ relative.y=10; Normalise(&relative); //victim->Puff(abdomen); - if(bloodtoggle)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .8, .3); + if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .8, .3); if(victim->bloodlossdamagetolerance){ victim->bloodloss+=1000; @@ -3079,17 +2852,17 @@ void Person::DoAnimations(){ if(1==1){ if(tutoriallevel!=1){ PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, true); - FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); - FSOUND_SetVolume(channels[heavyimpactsound], 128); - FSOUND_SetPaused(channels[heavyimpactsound], false); + OPENAL_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); + OPENAL_SetVolume(channels[heavyimpactsound], 128); + OPENAL_SetPaused(channels[heavyimpactsound], false); } } else { if(tutoriallevel!=1){ PlaySoundEx( landsound2, samp[landsound2], NULL, true); - FSOUND_3D_SetAttributes(channels[landsound2], gLoc, vel); - FSOUND_SetVolume(channels[landsound2], 256); - FSOUND_SetPaused(channels[landsound2], false); + OPENAL_3D_SetAttributes(channels[landsound2], gLoc, vel); + OPENAL_SetVolume(channels[landsound2], 256); + OPENAL_SetPaused(channels[landsound2], false); } } @@ -3137,25 +2910,25 @@ void Person::DoAnimations(){ if(victim->damage<=victim->damagetolerance-60&&normaldotproduct(victim->facing,victim->coords-coords)<(scale*5)*(scale*5)*0&&animation[victim->targetanimation].height!=lowheight){ if(tutoriallevel!=1){ PlaySoundEx( thudsound, samp[thudsound], NULL, true); - FSOUND_3D_SetAttributes(channels[thudsound], gLoc, vel); - FSOUND_SetVolume(channels[thudsound], 512); - FSOUND_SetPaused(channels[thudsound], false); + OPENAL_3D_SetAttributes(channels[thudsound], gLoc, vel); + OPENAL_SetVolume(channels[thudsound], 512); + OPENAL_SetPaused(channels[thudsound], false); } } else if(victim->damage<=victim->damagetolerance-60&&normaldotproduct(victim->facing,victim->coords-coords)<(scale*5)*(scale*5)*0&&animation[victim->targetanimation].height==lowheight){ if(tutoriallevel!=1){ PlaySoundEx( whooshhitsound, samp[whooshhitsound], NULL, true); - FSOUND_3D_SetAttributes(channels[whooshhitsound], gLoc, vel); - FSOUND_SetVolume(channels[whooshhitsound], 512); - FSOUND_SetPaused(channels[whooshhitsound], false); + OPENAL_3D_SetAttributes(channels[whooshhitsound], gLoc, vel); + OPENAL_SetVolume(channels[whooshhitsound], 512); + OPENAL_SetPaused(channels[whooshhitsound], false); } } else { if(tutoriallevel!=1){ PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, true); - FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); - FSOUND_SetVolume(channels[heavyimpactsound], 256); - FSOUND_SetPaused(channels[heavyimpactsound], false); + OPENAL_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); + OPENAL_SetVolume(channels[heavyimpactsound], 256); + OPENAL_SetPaused(channels[heavyimpactsound], false); } } @@ -3200,9 +2973,9 @@ void Person::DoAnimations(){ vel[2]=velocity.z; PlaySoundEx( landsound2, samp[landsound2], NULL, true); - FSOUND_3D_SetAttributes(channels[landsound2], gLoc, vel); - FSOUND_SetVolume(channels[landsound2], 256); - FSOUND_SetPaused(channels[landsound2], false); + OPENAL_3D_SetAttributes(channels[landsound2], gLoc, vel); + OPENAL_SetVolume(channels[landsound2], 256); + OPENAL_SetPaused(channels[landsound2], false); Puff(righthand); } @@ -3226,15 +2999,15 @@ void Person::DoAnimations(){ if(weapons.type[weaponids[0]]==staff)weapons.damage[weaponids[0]]+=.2+float(abs(Random()%100)-50)/250; PlaySoundEx( swordstaffsound, samp[swordstaffsound], NULL, true); - FSOUND_3D_SetAttributes(channels[swordstaffsound], gLoc, vel); - FSOUND_SetVolume(channels[swordstaffsound], 512); - FSOUND_SetPaused(channels[swordstaffsound], false); + OPENAL_3D_SetAttributes(channels[swordstaffsound], gLoc, vel); + OPENAL_SetVolume(channels[swordstaffsound], 512); + OPENAL_SetPaused(channels[swordstaffsound], false); } else{ PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, true); - FSOUND_3D_SetAttributes(channels[metalhitsound], gLoc, vel); - FSOUND_SetVolume(channels[metalhitsound], 512); - FSOUND_SetPaused(channels[metalhitsound], false); + OPENAL_3D_SetAttributes(channels[metalhitsound], gLoc, vel); + OPENAL_SetVolume(channels[metalhitsound], 512); + OPENAL_SetPaused(channels[metalhitsound], false); } } @@ -3275,11 +3048,7 @@ void Person::DoAnimations(){ if(tutoriallevel!=1)victim->DoBloodBig(1.5/victim->armorhigh,225); //} - if(id==0){ - bonus=Slicebonus; - bonustime=0; - bonusvalue=10; - } + award_bonus(id, Slicebonus); if(tutoriallevel!=1){ float gLoc[3]; float vel[3]; @@ -3290,9 +3059,9 @@ void Person::DoAnimations(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( knifeslicesound, samp[knifeslicesound], NULL, true); - FSOUND_3D_SetAttributes(channels[knifeslicesound], gLoc, vel); - FSOUND_SetVolume(channels[knifeslicesound], 512); - FSOUND_SetPaused(channels[knifeslicesound], false); + OPENAL_3D_SetAttributes(channels[knifeslicesound], gLoc, vel); + OPENAL_SetVolume(channels[knifeslicesound], 512); + OPENAL_SetPaused(channels[knifeslicesound], false); } //victim->skeleton.joints[victim->skeleton.jointlabels[abdomen]].velocity+=relative*damagemult*200; if(animation[victim->targetanimation].attack&&(victim->aitype!=playercontrolled||victim->targetanimation==knifeslashstartanim)&&(victim->creature==rabbittype||victim->deathbleeding<=0)){ @@ -3319,16 +3088,16 @@ void Person::DoAnimations(){ footpoint=DoRotation((victim->skeleton.joints[victim->skeleton.jointlabels[abdomen]].position+victim->skeleton.joints[victim->skeleton.jointlabels[neck]].position)/2,0,victim->rotation,0)*victim->scale+victim->coords; } if(tutoriallevel!=1){ - if(bloodtoggle)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .6, .3); + if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .6, .3); footvel=DoRotation(facing,0,90,0)*.8; //footvel.y-=.3; - sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); - sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); - sprites.MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .2, 1); - sprites.MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .2, 1); + Sprite::MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); + Sprite::MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); + Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .2, 1); + Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .2, 1); } if(tutoriallevel==1){ - sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,1,1, .6, .3); + Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,1,1, .6, .3); } victim->DoDamage(damagemult*0); } @@ -3336,11 +3105,7 @@ void Person::DoAnimations(){ if(targetanimation==swordslashanim&&animation[targetanimation].label[currentframe]==5&&victim->targetanimation!=rollanim){ if(findDistancefast(&coords,&victim->coords)<(scale*5)*(scale*5)*6.5&&victim->targetanimation!=dodgebackanim){ if(victim->weaponactive==-1||normaldotproduct(victim->facing,victim->coords-coords)>0||(Random()%2==0)){ - if(id==0){ - bonus=Slashbonus; - bonustime=0; - bonusvalue=40; - } + award_bonus(id, Slashbonus); escapednum=0; if(tutoriallevel!=1){ if(normaldotproduct(victim->facing,victim->coords-coords)<0)victim->DoBloodBig(2/victim->armorhigh,190); @@ -3355,9 +3120,9 @@ void Person::DoAnimations(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( swordslicesound, samp[swordslicesound], NULL, true); - FSOUND_3D_SetAttributes(channels[swordslicesound], gLoc, vel); - FSOUND_SetVolume(channels[swordslicesound], 512); - FSOUND_SetPaused(channels[swordslicesound], false); + OPENAL_3D_SetAttributes(channels[swordslicesound], gLoc, vel); + OPENAL_SetVolume(channels[swordslicesound], 512); + OPENAL_SetPaused(channels[swordslicesound], false); } //victim->skeleton.joints[victim->skeleton.jointlabels[abdomen]].velocity+=relative*damagemult*200; //if(animation[victim->targetanimation].attack){ @@ -3389,13 +3154,13 @@ void Person::DoAnimations(){ if(!skeleton.free){ footpoint=DoRotation((victim->skeleton.joints[victim->skeleton.jointlabels[abdomen]].position+victim->skeleton.joints[victim->skeleton.jointlabels[neck]].position)/2,0,victim->rotation,0)*victim->scale+victim->coords; } - if(bloodtoggle)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3); + if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3); footvel=DoRotation(facing,0,90,0)*.8; footvel.y-=.3; - sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); - sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); - sprites.MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .3, 1); - sprites.MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .3, 1); + Sprite::MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); + Sprite::MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); + Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .3, 1); + Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .3, 1); } } else { @@ -3415,15 +3180,15 @@ void Person::DoAnimations(){ if(weapons.type[weaponids[0]]==staff)weapons.damage[weaponids[0]]+=.2+float(abs(Random()%100)-50)/250; PlaySoundEx( swordstaffsound, samp[swordstaffsound], NULL, true); - FSOUND_3D_SetAttributes(channels[swordstaffsound], gLoc, vel); - FSOUND_SetVolume(channels[swordstaffsound], 512); - FSOUND_SetPaused(channels[swordstaffsound], false); + OPENAL_3D_SetAttributes(channels[swordstaffsound], gLoc, vel); + OPENAL_SetVolume(channels[swordstaffsound], 512); + OPENAL_SetPaused(channels[swordstaffsound], false); } else{ PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, true); - FSOUND_3D_SetAttributes(channels[metalhitsound], gLoc, vel); - FSOUND_SetVolume(channels[metalhitsound], 512); - FSOUND_SetPaused(channels[metalhitsound], false); + OPENAL_3D_SetAttributes(channels[metalhitsound], gLoc, vel); + OPENAL_SetVolume(channels[metalhitsound], 512); + OPENAL_SetPaused(channels[metalhitsound], false); } } @@ -3456,9 +3221,9 @@ void Person::DoAnimations(){ } /*PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, true); - FSOUND_3D_SetAttributes(channels[metalhitsound], gLoc, vel); - FSOUND_SetVolume(channels[metalhitsound], 512); - FSOUND_SetPaused(channels[metalhitsound], false);*/ + OPENAL_3D_SetAttributes(channels[metalhitsound], gLoc, vel); + OPENAL_SetVolume(channels[metalhitsound], 512); + OPENAL_SetPaused(channels[metalhitsound], false);*/ } } @@ -3482,9 +3247,9 @@ void Person::DoAnimations(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( staffheadsound, samp[staffheadsound], NULL, true); - FSOUND_3D_SetAttributes(channels[staffheadsound], gLoc, vel); - FSOUND_SetVolume(channels[staffheadsound], 256); - FSOUND_SetPaused(channels[staffheadsound], false); + OPENAL_3D_SetAttributes(channels[staffheadsound], gLoc, vel); + OPENAL_SetVolume(channels[staffheadsound], 256); + OPENAL_SetPaused(channels[staffheadsound], false); } victim->RagDoll(0); XYZ relative; @@ -3504,11 +3269,7 @@ void Person::DoAnimations(){ if(tutoriallevel!=1){ victim->DoDamage(damagemult*120/victim->protectionhigh); - if(id==0){ - bonus=solidhit; - bonustime=0; - bonusvalue=30; - } + award_bonus(id, solidhit, 30); } } } @@ -3531,9 +3292,9 @@ void Person::DoAnimations(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( staffheadsound, samp[staffheadsound], NULL, true); - FSOUND_3D_SetAttributes(channels[staffheadsound], gLoc, vel); - FSOUND_SetVolume(channels[staffheadsound], 256); - FSOUND_SetPaused(channels[staffheadsound], false); + OPENAL_3D_SetAttributes(channels[staffheadsound], gLoc, vel); + OPENAL_SetVolume(channels[staffheadsound], 256); + OPENAL_SetPaused(channels[staffheadsound], false); } victim->RagDoll(0); XYZ relative; @@ -3550,11 +3311,7 @@ void Person::DoAnimations(){ victim->Puff(head); if(tutoriallevel!=1){victim->DoDamage(damagemult*350/victim->protectionhead); - if(id==0){ - bonus=solidhit; - bonustime=0; - bonusvalue=60; - } + award_bonus(id, solidhit, 60); } } } @@ -3577,9 +3334,9 @@ void Person::DoAnimations(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( staffbodysound, samp[staffbodysound], NULL, true); - FSOUND_3D_SetAttributes(channels[staffbodysound], gLoc, vel); - FSOUND_SetVolume(channels[staffbodysound], 256); - FSOUND_SetPaused(channels[staffbodysound], false); + OPENAL_3D_SetAttributes(channels[staffbodysound], gLoc, vel); + OPENAL_SetVolume(channels[staffbodysound], 256); + OPENAL_SetPaused(channels[staffbodysound], false); } victim->skeleton.longdead=0; victim->skeleton.free=1; @@ -3618,11 +3375,7 @@ void Person::DoAnimations(){ if(tutoriallevel!=1){victim->DoDamage(damagemult*100/victim->protectionhigh); if(!victim->dead){ - if(id==0){ - bonus=solidhit; - bonustime=0; - bonusvalue=40; - } + award_bonus(id, solidhit, 40); } } } @@ -3661,18 +3414,18 @@ void Person::DoAnimations(){ victim->skeleton.joints[victim->skeleton.jointlabels[head]].velocity+=relative*damagemult*200; if(tutoriallevel!=1){ PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, true); - FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); - FSOUND_SetVolume(channels[heavyimpactsound], 128); - FSOUND_SetPaused(channels[heavyimpactsound], false); + OPENAL_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); + OPENAL_SetVolume(channels[heavyimpactsound], 128); + OPENAL_SetPaused(channels[heavyimpactsound], false); } victim->Puff(head); victim->DoDamage(damagemult*100/victim->protectionhead); if(victim->howactive==typesleeping)victim->DoDamage(damagemult*150/victim->protectionhead); if(creature==wolftype){ PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, true); - FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel); - FSOUND_SetVolume(channels[clawslicesound], 128); - FSOUND_SetPaused(channels[clawslicesound], false); + OPENAL_3D_SetAttributes(channels[clawslicesound], gLoc, vel); + OPENAL_SetVolume(channels[clawslicesound], 128); + OPENAL_SetPaused(channels[clawslicesound], false); victim->spurt=1; victim->DoBloodBig(2/victim->armorhead,175); } @@ -3689,17 +3442,17 @@ void Person::DoAnimations(){ victim->target=0; if(tutoriallevel!=1){ PlaySoundEx( landsound2, samp[landsound2], NULL, true); - FSOUND_3D_SetAttributes(channels[landsound2], gLoc, vel); - FSOUND_SetVolume(channels[landsound2], 128); - FSOUND_SetPaused(channels[landsound2], false); + OPENAL_3D_SetAttributes(channels[landsound2], gLoc, vel); + OPENAL_SetVolume(channels[landsound2], 128); + OPENAL_SetPaused(channels[landsound2], false); } victim->Puff(abdomen); victim->DoDamage(damagemult*30/victim->protectionhigh); if(creature==wolftype){ PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, true); - FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel); - FSOUND_SetVolume(channels[clawslicesound], 128); - FSOUND_SetPaused(channels[clawslicesound], false); + OPENAL_3D_SetAttributes(channels[clawslicesound], gLoc, vel); + OPENAL_SetVolume(channels[clawslicesound], 128); + OPENAL_SetPaused(channels[clawslicesound], false); victim->spurt=1; victim->DoBloodBig(2/victim->armorhigh,170); } @@ -3722,9 +3475,9 @@ void Person::DoAnimations(){ vel[2]=velocity.z; if(tutoriallevel!=1){ PlaySoundEx( landsound2, samp[landsound2], NULL, true); - FSOUND_3D_SetAttributes(channels[landsound2], gLoc, vel); - FSOUND_SetVolume(channels[landsound2], 128); - FSOUND_SetPaused(channels[landsound2], false); + OPENAL_3D_SetAttributes(channels[landsound2], gLoc, vel); + OPENAL_SetVolume(channels[landsound2], 128); + OPENAL_SetPaused(channels[landsound2], false); } XYZ relative; relative=victim->coords-coords; @@ -3764,9 +3517,9 @@ void Person::DoAnimations(){ victim->target=0; if(tutoriallevel!=1){ PlaySoundEx( landsound2, samp[landsound2], NULL, true); - FSOUND_3D_SetAttributes(channels[landsound2], gLoc, vel); - FSOUND_SetVolume(channels[landsound2], 128); - FSOUND_SetPaused(channels[landsound2], false); + OPENAL_3D_SetAttributes(channels[landsound2], gLoc, vel); + OPENAL_SetVolume(channels[landsound2], 128); + OPENAL_SetPaused(channels[landsound2], false); } victim->Puff(abdomen); victim->DoDamage(damagemult*30/victim->protectionlow); @@ -3797,15 +3550,15 @@ void Person::DoAnimations(){ vel[2]=velocity.z; if(tutoriallevel!=1){ PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, true); - FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); - FSOUND_SetVolume(channels[heavyimpactsound], 128); - FSOUND_SetPaused(channels[heavyimpactsound], false); + OPENAL_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); + OPENAL_SetVolume(channels[heavyimpactsound], 128); + OPENAL_SetPaused(channels[heavyimpactsound], false); } if(creature==wolftype){ PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, true); - FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel); - FSOUND_SetVolume(channels[clawslicesound], 128); - FSOUND_SetPaused(channels[clawslicesound], false); + OPENAL_3D_SetAttributes(channels[clawslicesound], gLoc, vel); + OPENAL_SetVolume(channels[clawslicesound], 128); + OPENAL_SetPaused(channels[clawslicesound], false); victim->spurt=1; victim->DoBloodBig(2/victim->armorhigh,170); } @@ -3823,11 +3576,7 @@ void Person::DoAnimations(){ victim->Puff(abdomen); victim->DoDamage(damagemult*150/victim->protectionhigh); - if(id==0){ - bonus=Reversal; - bonustime=0; - bonusvalue=60; - } + award_bonus(id, Reversal); } if((targetanimation==swordslashreversalanim||targetanimation==knifeslashreversalanim||targetanimation==staffhitreversalanim||targetanimation==staffspinhitreversalanim)&&animation[targetanimation].label[currentframe]==5){ @@ -3866,9 +3615,9 @@ void Person::DoAnimations(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( whooshhitsound, samp[whooshhitsound], NULL, true); - FSOUND_3D_SetAttributes(channels[whooshhitsound], gLoc, vel); - FSOUND_SetVolume(channels[whooshhitsound], 128); - FSOUND_SetPaused(channels[whooshhitsound], false); + OPENAL_3D_SetAttributes(channels[whooshhitsound], gLoc, vel); + OPENAL_SetVolume(channels[whooshhitsound], 128); + OPENAL_SetPaused(channels[whooshhitsound], false); victim->RagDoll(0); XYZ relative; relative=victim->coords-oldcoords; @@ -3900,24 +3649,16 @@ void Person::DoAnimations(){ vel[1]=velocity.y; vel[2]=velocity.z; - if(id==0){ - bonus=staffreversebonus; - bonustime=0; - bonusvalue=100; - } + award_bonus(id, staffreversebonus); if(tutoriallevel!=1){ PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, true); - FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); - FSOUND_SetVolume(channels[heavyimpactsound], 128); - FSOUND_SetPaused(channels[heavyimpactsound], false); + OPENAL_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); + OPENAL_SetVolume(channels[heavyimpactsound], 128); + OPENAL_SetPaused(channels[heavyimpactsound], false); } victim->RagDoll(0); - if(id==0){ - bonus=staffreversebonus; - bonustime=0; - bonusvalue=100; - } + award_bonus(id, staffreversebonus); // Huh, again? XYZ relative; relative=victim->coords-oldcoords; @@ -3957,11 +3698,7 @@ void Person::DoAnimations(){ victim->Puff(abdomen); victim->DoDamage(damagemult*90/victim->protectionhigh); - if(id==0){ - bonus=Reversal; - bonustime=0; - bonusvalue=60; - } + award_bonus(id, Reversal); bool doslice; doslice=0; @@ -3979,17 +3716,17 @@ void Person::DoAnimations(){ if(weaponactive!=-1){ victim->DoBloodBig(2/victim->armorhigh,225); PlaySoundEx( knifeslicesound, samp[knifeslicesound], NULL, true); - FSOUND_3D_SetAttributes(channels[knifeslicesound], gLoc, vel); - FSOUND_SetVolume(channels[knifeslicesound], 512); - FSOUND_SetPaused(channels[knifeslicesound], false); + OPENAL_3D_SetAttributes(channels[knifeslicesound], gLoc, vel); + OPENAL_SetVolume(channels[knifeslicesound], 512); + OPENAL_SetPaused(channels[knifeslicesound], false); if(bloodtoggle&&!weapons.bloody[weaponids[weaponactive]])weapons.bloody[weaponids[weaponactive]]=1; weapons.blooddrip[weaponids[weaponactive]]+=3; } if(weaponactive==-1&&creature==wolftype){ PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, true); - FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel); - FSOUND_SetVolume(channels[clawslicesound], 128); - FSOUND_SetPaused(channels[clawslicesound], false); + OPENAL_3D_SetAttributes(channels[clawslicesound], gLoc, vel); + OPENAL_SetVolume(channels[clawslicesound], 128); + OPENAL_SetPaused(channels[clawslicesound], false); victim->spurt=1; victim->DoBloodBig(2/victim->armorhigh,175); } @@ -4019,30 +3756,7 @@ void Person::DoAnimations(){ victim->skeleton.joints[victim->skeleton.jointlabels[rightelbow]].velocity*=.5-1; victim->skeleton.joints[victim->skeleton.jointlabels[rightshoulder]].velocity*=.7-1; - if(id==0){ - bonus=swordreversebonus; - bonustime=0; - bonusvalue=100; - } - //victim->DoDamage(90); - - /*if(weaponactive!=-1){ - float gLoc[3]; - float vel[3]; - gLoc[0]=victim->coords.x; - gLoc[1]=victim->coords.y; - gLoc[2]=victim->coords.z; - vel[0]=velocity.x; - vel[1]=velocity.y; - vel[2]=velocity.z; - victim->DoBloodBig(2,225); - PlaySoundEx( knifeslicesound, samp[knifeslicesound], NULL, true); - FSOUND_3D_SetAttributes(channels[knifeslicesound], gLoc, vel); - FSOUND_SetVolume(channels[knifeslicesound], 512); - FSOUND_SetPaused(channels[knifeslicesound], false); - if(bloodtoggle&&!weapons.bloody[weaponids[weaponactive]])weapons.bloody[weaponids[weaponactive]]=1; - weapons.blooddrip[weaponids[weaponactive]]+=3; - }*/ + award_bonus(id, swordreversebonus); } if(hasvictim&&targetanimation==knifeslashreversalanim&&animation[targetanimation].label[currentframe]==7){ @@ -4062,9 +3776,9 @@ void Person::DoAnimations(){ vel[2]=velocity.z; if(tutoriallevel!=1){ PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, true); - FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); - FSOUND_SetVolume(channels[heavyimpactsound], 128); - FSOUND_SetPaused(channels[heavyimpactsound], false); + OPENAL_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); + OPENAL_SetVolume(channels[heavyimpactsound], 128); + OPENAL_SetPaused(channels[heavyimpactsound], false); } victim->RagDoll(0); XYZ relative; @@ -4080,11 +3794,7 @@ void Person::DoAnimations(){ victim->Puff(abdomen); victim->DoDamage(damagemult*30/victim->protectionhigh); - if(id==0){ - bonus=Reversal; - bonustime=0; - bonusvalue=60; - } + award_bonus(id, Reversal); } if(hasvictim&&targetanimation==sneakattackanim&&animation[targetanimation].label[currentframe]==7){ @@ -4118,27 +3828,23 @@ void Person::DoAnimations(){ if(weaponactive!=-1){ victim->DoBloodBig(200,225); PlaySoundEx( knifeslicesound, samp[knifeslicesound], NULL, true); - FSOUND_3D_SetAttributes(channels[knifeslicesound], gLoc, vel); - FSOUND_SetVolume(channels[knifeslicesound], 512); - FSOUND_SetPaused(channels[knifeslicesound], false); + OPENAL_3D_SetAttributes(channels[knifeslicesound], gLoc, vel); + OPENAL_SetVolume(channels[knifeslicesound], 512); + OPENAL_SetPaused(channels[knifeslicesound], false); if(bloodtoggle)weapons.bloody[weaponids[weaponactive]]=2; weapons.blooddrip[weaponids[weaponactive]]+=5; } if(creature==wolftype&&weaponactive==-1){ PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, true); - FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel); - FSOUND_SetVolume(channels[clawslicesound], 128); - FSOUND_SetPaused(channels[clawslicesound], false); + OPENAL_3D_SetAttributes(channels[clawslicesound], gLoc, vel); + OPENAL_SetVolume(channels[clawslicesound], 128); + OPENAL_SetPaused(channels[clawslicesound], false); victim->spurt=1; victim->DoBloodBig(2,175); } } - if(id==0){ - bonus=spinecrusher; - bonustime=0; - bonusvalue=100; - } + award_bonus(id, spinecrusher); } if(hasvictim&&(targetanimation==knifefollowanim||targetanimation==knifesneakattackanim)&&animation[targetanimation].label[currentframe]==5){ @@ -4152,41 +3858,31 @@ void Person::DoAnimations(){ bloodvel.z=20; bloodvel.y=5; bloodvel=DoRotation(bloodvel,((float)(Random()%100))/4,rotation+((float)(Random()%100))/4,0)*scale; - sprites.MakeSprite(bloodsprite, DoRotation(skeleton.joints[skeleton.jointlabels[neck]].position,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1); + Sprite::MakeSprite(bloodsprite, DoRotation(skeleton.joints[skeleton.jointlabels[neck]].position,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1); */ XYZ footvel,footpoint; footvel=0; footpoint=weapons.tippoint[weaponids[0]]; - if(bloodtoggle)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3); + if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3); footvel=(weapons.tippoint[weaponids[0]]-weapons.position[weaponids[0]]); - sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); - sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); - sprites.MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .3, 1); - sprites.MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .3, 1); + Sprite::MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); + Sprite::MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); + Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .3, 1); + Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .3, 1); victim->DoBloodBig(200,195); - if(id==0){ - bonus=tracheotomy; - bonustime=0; - bonusvalue=100; - } - - //victim->neckspurtamount=5; + award_bonus(id, tracheotomy); } if(targetanimation==knifefollowanim){ - if(id==0){ - bonus=Stabbonus; - bonustime=0; - bonusvalue=40; - } + award_bonus(id, Stabbonus); XYZ footvel,footpoint; footvel=0; footpoint=weapons.tippoint[weaponids[0]]; - if(bloodtoggle)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3); + if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3); footvel=(weapons.tippoint[weaponids[0]]-weapons.position[weaponids[0]])*-1; - sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); - sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); - sprites.MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .2, 1); - sprites.MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .2, 1); + Sprite::MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); + Sprite::MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); + Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .2, 1); + Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .2, 1); } victim->bloodloss+=10000; @@ -4200,9 +3896,9 @@ void Person::DoAnimations(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( fleshstabsound, samp[fleshstabsound], NULL, true); - FSOUND_3D_SetAttributes(channels[fleshstabsound], gLoc, vel); - FSOUND_SetVolume(channels[fleshstabsound], 512); - FSOUND_SetPaused(channels[fleshstabsound], false); + OPENAL_3D_SetAttributes(channels[fleshstabsound], gLoc, vel); + OPENAL_SetVolume(channels[fleshstabsound], 512); + OPENAL_SetPaused(channels[fleshstabsound], false); if(bloodtoggle)weapons.bloody[weaponids[weaponactive]]=2; weapons.blooddrip[weaponids[weaponactive]]+=5; } @@ -4230,43 +3926,39 @@ void Person::DoAnimations(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( fleshstabremovesound, samp[fleshstabremovesound], NULL, true); - FSOUND_3D_SetAttributes(channels[fleshstabremovesound], gLoc, vel); - FSOUND_SetVolume(channels[fleshstabremovesound], 512); - FSOUND_SetPaused(channels[fleshstabremovesound], false); + OPENAL_3D_SetAttributes(channels[fleshstabremovesound], gLoc, vel); + OPENAL_SetVolume(channels[fleshstabremovesound], 512); + OPENAL_SetPaused(channels[fleshstabremovesound], false); if(bloodtoggle)weapons.bloody[weaponids[weaponactive]]=2; weapons.blooddrip[weaponids[weaponactive]]+=5; XYZ footvel,footpoint; footvel=0; footpoint=weapons.tippoint[weaponids[0]]; - if(bloodtoggle)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3); + if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3); footvel=(weapons.tippoint[weaponids[0]]-weapons.position[weaponids[0]])*-1; - sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); - sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); - sprites.MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .3, 1); - sprites.MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .3, 1); + Sprite::MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); + Sprite::MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); + Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .3, 1); + Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .3, 1); } } if(hasvictim&&(targetanimation==swordsneakattackanim)&&animation[targetanimation].label[currentframe]==5){ if(weaponactive!=-1&&victim->bloodlossdamagetolerance){ - if(id==0){ - bonus=backstab; - bonustime=0; - bonusvalue=100; - } + award_bonus(id, backstab); escapednum=0; XYZ footvel,footpoint; footvel=0; footpoint=(weapons.tippoint[weaponids[0]]+weapons.position[weaponids[0]])/2; - if(bloodtoggle)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3); + if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3); footvel=(weapons.tippoint[weaponids[0]]-weapons.position[weaponids[0]]); - sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); - sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); - sprites.MakeSprite(bloodflamesprite, footpoint,DoRotation(footvel*5,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .3, 1); - sprites.MakeSprite(bloodflamesprite, footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .3, 1); + Sprite::MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); + Sprite::MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); + Sprite::MakeSprite(bloodflamesprite, footpoint,DoRotation(footvel*5,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .3, 1); + Sprite::MakeSprite(bloodflamesprite, footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .3, 1); victim->DoBloodBig(200,180); victim->DoBloodBig(200,215); victim->bloodloss+=10000; @@ -4280,9 +3972,9 @@ void Person::DoAnimations(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( fleshstabsound, samp[fleshstabsound], NULL, true); - FSOUND_3D_SetAttributes(channels[fleshstabsound], gLoc, vel); - FSOUND_SetVolume(channels[fleshstabsound], 512); - FSOUND_SetPaused(channels[fleshstabsound], false); + OPENAL_3D_SetAttributes(channels[fleshstabsound], gLoc, vel); + OPENAL_SetVolume(channels[fleshstabsound], 512); + OPENAL_SetPaused(channels[fleshstabsound], false); if(bloodtoggle)weapons.bloody[weaponids[weaponactive]]=2; weapons.blooddrip[weaponids[weaponactive]]+=5; } @@ -4304,21 +3996,21 @@ void Person::DoAnimations(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( fleshstabremovesound, samp[fleshstabremovesound], NULL, true); - FSOUND_3D_SetAttributes(channels[fleshstabremovesound], gLoc, vel); - FSOUND_SetVolume(channels[fleshstabremovesound], 512); - FSOUND_SetPaused(channels[fleshstabremovesound], false); + OPENAL_3D_SetAttributes(channels[fleshstabremovesound], gLoc, vel); + OPENAL_SetVolume(channels[fleshstabremovesound], 512); + OPENAL_SetPaused(channels[fleshstabremovesound], false); if(bloodtoggle)weapons.bloody[weaponids[weaponactive]]=2; weapons.blooddrip[weaponids[weaponactive]]+=5; XYZ footvel,footpoint; footvel=0; footpoint=weapons.tippoint[weaponids[0]]; - if(bloodtoggle)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3); + if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3); footvel=(weapons.tippoint[weaponids[0]]-weapons.position[weaponids[0]])*-1; - sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); - sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); - sprites.MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .3, 1); - sprites.MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .3, 1); + Sprite::MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); + Sprite::MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9); + Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .3, 1); + Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .3, 1); } } @@ -4340,9 +4032,9 @@ void Person::DoAnimations(){ if(weaponactive==-1){ if(tutoriallevel!=1){ PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, true); - FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); - FSOUND_SetVolume(channels[heavyimpactsound], 128); - FSOUND_SetPaused(channels[heavyimpactsound], false); + OPENAL_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel); + OPENAL_SetVolume(channels[heavyimpactsound], 128); + OPENAL_SetPaused(channels[heavyimpactsound], false); } } bool doslice; @@ -4353,27 +4045,23 @@ void Person::DoAnimations(){ if(weaponactive!=-1){ victim->DoBloodBig(2/victim->armorhead,225); PlaySoundEx( knifeslicesound, samp[knifeslicesound], NULL, true); - FSOUND_3D_SetAttributes(channels[knifeslicesound], gLoc, vel); - FSOUND_SetVolume(channels[knifeslicesound], 512); - FSOUND_SetPaused(channels[knifeslicesound], false); + OPENAL_3D_SetAttributes(channels[knifeslicesound], gLoc, vel); + OPENAL_SetVolume(channels[knifeslicesound], 512); + OPENAL_SetPaused(channels[knifeslicesound], false); if(bloodtoggle&&!weapons.bloody[weaponids[weaponactive]])weapons.bloody[weaponids[weaponactive]]=1; weapons.blooddrip[weaponids[weaponactive]]+=3; } if(weaponactive==-1&&creature==wolftype){ PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, true); - FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel); - FSOUND_SetVolume(channels[clawslicesound], 128); - FSOUND_SetPaused(channels[clawslicesound], false); + OPENAL_3D_SetAttributes(channels[clawslicesound], gLoc, vel); + OPENAL_SetVolume(channels[clawslicesound], 128); + OPENAL_SetPaused(channels[clawslicesound], false); victim->spurt=1; victim->DoBloodBig(2/victim->armorhead,175); } } - if(id==0){ - bonus=Reversal; - bonustime=0; - bonusvalue=60; - } + award_bonus(id, Reversal); victim->Puff(neck); @@ -4413,11 +4101,7 @@ void Person::DoAnimations(){ if(hasvictim&&(targetanimation==spinkickreversalanim||targetanimation==sweepreversalanim||targetanimation==rabbitkickreversalanim||targetanimation==upunchreversalanim||targetanimation==jumpreversalanim||targetanimation==swordslashreversalanim||targetanimation==knifeslashreversalanim||targetanimation==rabbittacklereversal||targetanimation==wolftacklereversal||targetanimation==staffhitreversalanim||targetanimation==staffspinhitreversalanim)) if(victim->damage>victim->damagetolerance&&bonus!=reverseko){ - if(id==0){ - bonus=reverseko; - bonustime=0; - bonusvalue=100; - } + award_bonus(id, reverseko); } } @@ -4443,9 +4127,9 @@ void Person::DoAnimations(){ vel[2]=velocity.z; PlaySoundEx( movewhooshsound, samp[movewhooshsound], NULL, true); - FSOUND_3D_SetAttributes(channels[movewhooshsound], gLoc, vel); - FSOUND_SetVolume(channels[movewhooshsound], 128); - FSOUND_SetPaused(channels[movewhooshsound], false); + OPENAL_3D_SetAttributes(channels[movewhooshsound], gLoc, vel); + OPENAL_SetVolume(channels[movewhooshsound], 128); + OPENAL_SetPaused(channels[movewhooshsound], false); } if(currentanimation==staggerbackhighanim){ targetanimation=getIdle(); @@ -4495,9 +4179,9 @@ void Person::DoAnimations(){ vel[2]=velocity.z; PlaySoundEx( knifesheathesound, samp[knifesheathesound], NULL, true); - FSOUND_3D_SetAttributes(channels[knifesheathesound], gLoc, vel); - FSOUND_SetVolume(channels[knifesheathesound], 128); - FSOUND_SetPaused(channels[knifesheathesound], false); + OPENAL_3D_SetAttributes(channels[knifesheathesound], gLoc, vel); + OPENAL_SetVolume(channels[knifesheathesound], 128); + OPENAL_SetPaused(channels[knifesheathesound], false); } if(weaponactive!=-1){ float gLoc[3]; @@ -4510,9 +4194,9 @@ void Person::DoAnimations(){ vel[2]=velocity.z; PlaySoundEx( knifedrawsound, samp[knifedrawsound], NULL, true); - FSOUND_3D_SetAttributes(channels[knifedrawsound], gLoc, vel); - FSOUND_SetVolume(channels[knifedrawsound], 128); - FSOUND_SetPaused(channels[knifedrawsound], false); + OPENAL_3D_SetAttributes(channels[knifedrawsound], gLoc, vel); + OPENAL_SetVolume(channels[knifedrawsound], 128); + OPENAL_SetPaused(channels[knifedrawsound], false); } } if(currentanimation==rollanim){ @@ -4587,7 +4271,7 @@ void Person::DoAnimations(){ targetframe=3; velocity=facing*-8; velocity.y=4; - if(id==0)FSOUND_SetPaused(channels[whooshsound], false); + if(id==0)OPENAL_SetPaused(channels[whooshsound], false); } if(targetanimation==walljumprightanim){ targetanimation=rightflipanim; @@ -4605,7 +4289,7 @@ void Person::DoAnimations(){ velocity=facing*8; velocity.y=4; } - if(id==0)FSOUND_SetPaused(channels[whooshsound], false); + if(id==0)OPENAL_SetPaused(channels[whooshsound], false); } if(targetanimation==walljumpleftanim){ if(attackkeydown){ @@ -4645,7 +4329,7 @@ void Person::DoAnimations(){ velocity=DoRotation(facing,0,-30,0)*-8; velocity.y=4; } - if(id==0)FSOUND_SetPaused(channels[whooshsound], false); + if(id==0)OPENAL_SetPaused(channels[whooshsound], false); } if(targetanimation==sneakattackanim){ float ycoords=oldcoords.y; @@ -4741,9 +4425,9 @@ void Person::DoAnimations(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( landsound, samp[landsound], NULL, true); - FSOUND_3D_SetAttributes(channels[landsound], gLoc, vel); - FSOUND_SetVolume(channels[landsound], 128); - FSOUND_SetPaused(channels[landsound], false); + OPENAL_3D_SetAttributes(channels[landsound], gLoc, vel); + OPENAL_SetVolume(channels[landsound], 128); + OPENAL_SetPaused(channels[landsound], false); if(currentanimation==upunchreversedanim||currentanimation==swordslashreversedanim){ targetanimation=rollanim; @@ -4809,7 +4493,7 @@ void Person::DoAnimations(){ escapednum++; targetanimation=rollanim; coords+=facing; - if(id==0)FSOUND_SetPaused(channels[whooshsound], true); + if(id==0)OPENAL_SetPaused(channels[whooshsound], true); } lastfeint=0; } @@ -4832,7 +4516,7 @@ void Person::DoAnimations(){ escapednum++; targetanimation=rollanim; coords+=facing*2; - if(id==0)FSOUND_SetPaused(channels[whooshsound], true); + if(id==0)OPENAL_SetPaused(channels[whooshsound], true); } lastfeint=0; } @@ -5053,12 +4737,6 @@ void Person::DoStuff(){ targetanimation=getRun(); targetframe=0; } - /*static float toggledelay; - toggledelay-=multiplier; - if(toggledelay<0){ - toggledelay=1; - if(Random()%3==0)superruntoggle=1-superruntoggle; - }*/ } if(weaponactive==-1&&num_weapons>0){ if(weapons.type[weaponids[0]]==staff){ @@ -5072,7 +4750,7 @@ void Person::DoStuff(){ /*if(aitype!=playercontrolled)*/ deathbleeding=1; if(burnt>.6)burnt=.6; - FSOUND_SetVolume(channels[stream_firesound], 256+256*findLength(&velocity)/3); + OPENAL_SetVolume(channels[stream_firesound], 256+256*findLength(&velocity)/3); if(targetanimation==jumpupanim||targetanimation==jumpdownanim||isFlip()){ float gLoc[3]; @@ -5085,8 +4763,8 @@ void Person::DoStuff(){ vel[2]=velocity.z; if(id==0){ - FSOUND_3D_SetAttributes(channels[whooshsound], gLoc, vel); - FSOUND_SetVolume(channels[whooshsound], 64*findLength(&velocity)/5); + OPENAL_3D_SetAttributes(channels[whooshsound], gLoc, vel); + OPENAL_SetVolume(channels[whooshsound], 64*findLength(&velocity)/5); } } } @@ -5097,7 +4775,7 @@ void Person::DoStuff(){ if(skeleton.free)flatvelocity=skeleton.joints[howmany].velocity*scale/2; if(!skeleton.free)flatfacing=DoRotation(DoRotation(DoRotation(skeleton.joints[howmany].position,0,0,tilt),tilt2,0,0),0,rotation,0)*scale+coords; if(skeleton.free)flatfacing=skeleton.joints[howmany].position*scale+coords; - sprites.MakeSprite(flamesprite, flatfacing,flatvelocity, 1,1,1, .6+(float)abs(Random()%100)/200-.25, 1); + Sprite::MakeSprite(flamesprite, flatfacing,flatvelocity, 1,1,1, .6+(float)abs(Random()%100)/200-.25, 1); } while(flamedelay<0&&!onfire&&tutoriallevel==1&&id!=0){ @@ -5107,7 +4785,7 @@ void Person::DoStuff(){ if(skeleton.free)flatvelocity=skeleton.joints[howmany].velocity*scale/2; if(!skeleton.free)flatfacing=DoRotation(DoRotation(DoRotation(skeleton.joints[howmany].position,0,0,tilt),tilt2,0,0),0,rotation,0)*scale+coords; if(skeleton.free)flatfacing=skeleton.joints[howmany].position*scale+coords; - sprites.MakeSprite(breathsprite, flatfacing,flatvelocity, 1,1,1, .6+(float)abs(Random()%100)/200-.25, .3); + Sprite::MakeSprite(breathsprite, flatfacing,flatvelocity, 1,1,1, .6+(float)abs(Random()%100)/200-.25, .3); } if(bleeding>0){ @@ -5134,8 +4812,8 @@ void Person::DoStuff(){ } if(skeleton.free)bloodvel+=DoRotation(skeleton.joints[skeleton.jointlabels[head]].velocity,((float)(Random()%100))/40,rotation+((float)(Random()%100))/40,0)*scale; if(!skeleton.free)bloodvel+=DoRotation(velocity,((float)(Random()%100))/40,((float)(Random()%100))/40,0)*scale; - if(skeleton.free)sprites.MakeSprite(bloodsprite, (skeleton.joints[skeleton.jointlabels[neck]].position+(skeleton.joints[skeleton.jointlabels[neck]].position-skeleton.joints[skeleton.jointlabels[head]].position)/5)*scale+coords,bloodvel, 1,1,1, .05, .9); - if(!skeleton.free)sprites.MakeSprite(bloodsprite, DoRotation(skeleton.joints[skeleton.jointlabels[neck]].position+(skeleton.joints[skeleton.jointlabels[neck]].position-skeleton.joints[skeleton.jointlabels[head]].position)/5,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, .9); + if(skeleton.free)Sprite::MakeSprite(bloodsprite, (skeleton.joints[skeleton.jointlabels[neck]].position+(skeleton.joints[skeleton.jointlabels[neck]].position-skeleton.joints[skeleton.jointlabels[head]].position)/5)*scale+coords,bloodvel, 1,1,1, .05, .9); + if(!skeleton.free)Sprite::MakeSprite(bloodsprite, DoRotation(skeleton.joints[skeleton.jointlabels[neck]].position+(skeleton.joints[skeleton.jointlabels[neck]].position-skeleton.joints[skeleton.jointlabels[head]].position)/5,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, .9); neckspurtparticledelay=.05; } if(neckspurtdelay<0){ @@ -5153,14 +4831,10 @@ void Person::DoStuff(){ bloodvel=0; if(skeleton.free)bloodvel+=DoRotation(skeleton.joints[skeleton.jointlabels[abdomen]].velocity,((float)(Random()%100))/4,rotation+((float)(Random()%100))/4,0)*scale; if(!skeleton.free)bloodvel+=DoRotation(velocity,((float)(Random()%100))/4,((float)(Random()%100))/4,0)*scale; - if(skeleton.free)sprites.MakeSprite(bloodsprite, skeleton.joints[skeleton.jointlabels[abdomen]].position*scale+coords,bloodvel, 1,1,1, .05, 1); - if(!skeleton.free)sprites.MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[abdomen]].position+skeleton.joints[skeleton.jointlabels[abdomen]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1); + if(skeleton.free)Sprite::MakeSprite(bloodsprite, skeleton.joints[skeleton.jointlabels[abdomen]].position*scale+coords,bloodvel, 1,1,1, .05, 1); + if(!skeleton.free)Sprite::MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[abdomen]].position+skeleton.joints[skeleton.jointlabels[abdomen]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1); } } - /*if(id==0){ - bloodloss+=deathbleeding*40; - deathbleeding=0; - }*/ bloodloss+=deathbleeding*multiplier*80; deathbleeding-=multiplier*1.6; //if(id==0)deathbleeding-=multiplier*.2; @@ -5196,9 +4870,7 @@ void Person::DoStuff(){ } if(!dead&&creature==wolftype){ - bonus=Wolfbonus; - bonustime=0; - bonusvalue=300; + award_bonus(0, Wolfbonus); } dead=2; if(targetanimation==knifefollowedanim&&!skeleton.free){ @@ -5234,10 +4906,6 @@ void Person::DoStuff(){ if(endy>skeleton.skinsize-1){endy=skeleton.skinsize-1;bleeding=0;} if(endx1)&&(bonus!=FinishedBonus||bonustime>1)&&bloodloss1)&&(bonus!=FinishedBonus||bonustime>1)&&bloodloss.1){ numafterkill++; } @@ -5700,9 +5355,9 @@ void Person::DoStuff(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( breaksound, samp[breaksound], NULL, true); - FSOUND_3D_SetAttributes(channels[breaksound], gLoc, vel); - FSOUND_SetVolume(channels[breaksound], 512); - FSOUND_SetPaused(channels[breaksound], false); + OPENAL_3D_SetAttributes(channels[breaksound], gLoc, vel); + OPENAL_SetVolume(channels[breaksound], 512); + OPENAL_SetPaused(channels[breaksound], false); /*if(id==0||findDistancefast(&coords,&viewer)<50){ slomo=1; slomodelay=.2; @@ -5710,7 +5365,7 @@ void Person::DoStuff(){ } if(skeleton.free==1){ - if(id==0)FSOUND_SetPaused(channels[whooshsound], true); + if(id==0)OPENAL_SetPaused(channels[whooshsound], true); if(!dead){ //If knocked over, open hands and close mouth @@ -5732,11 +5387,8 @@ void Person::DoStuff(){ skeleton.DoGravity(&scale); float damageamount; damageamount=skeleton.DoConstraints(&coords,&scale)*5; - if(id!=0&&damage>damagetolerance-damageamount&&!dead&&(bonus!=spinecrusher||bonustime>1)&&(bonus!=style||bonustime>1)&&(bonus!=cannon||bonustime>1)){ - bonus=deepimpact; - bonustime=0; - bonusvalue=50; - } + if(damage>damagetolerance-damageamount&&!dead&&(bonus!=spinecrusher||bonustime>1)&&(bonus!=style||bonustime>1)&&(bonus!=cannon||bonustime>1)) + award_bonus(id, deepimpact); DoDamage(damageamount/((protectionhigh+protectionhead+protectionlow)/3)); average=0; @@ -5776,7 +5428,7 @@ void Person::DoStuff(){ skeleton.longdead+=(2000-findLength(&average))*multiplier+multiplier; if(skeleton.longdead>2000){ if(skeleton.longdead>6000){ - if(id==0)FSOUND_SetPaused(channels[whooshsound], true); + if(id==0)OPENAL_SetPaused(channels[whooshsound], true); skeleton.free=3; DrawSkeleton(); skeleton.free=2; @@ -5889,7 +5541,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)FSOUND_SetPaused(channels[whooshsound], true); + if(id==0)OPENAL_SetPaused(channels[whooshsound], true); skeleton.free=0; velocity=0; XYZ middle; @@ -6017,9 +5669,9 @@ void Person::DoStuff(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( movewhooshsound, samp[movewhooshsound], NULL, true); - FSOUND_3D_SetAttributes(channels[movewhooshsound], gLoc, vel); - FSOUND_SetVolume(channels[movewhooshsound], 128); - FSOUND_SetPaused(channels[movewhooshsound], false); + OPENAL_3D_SetAttributes(channels[movewhooshsound], gLoc, vel); + OPENAL_SetVolume(channels[movewhooshsound], 128); + OPENAL_SetPaused(channels[movewhooshsound], false); currentanimation=targetanimation; currentframe=targetframe-1; @@ -6057,9 +5709,9 @@ void Person::DoStuff(){ vel[1]=0; vel[2]=0; PlaySoundEx( firestartsound, samp[firestartsound], NULL, true); - FSOUND_3D_SetAttributes(channels[firestartsound], gLoc, vel); - FSOUND_SetVolume(channels[firestartsound], 256); - FSOUND_SetPaused(channels[firestartsound], false); + OPENAL_3D_SetAttributes(channels[firestartsound], gLoc, vel); + OPENAL_SetVolume(channels[firestartsound], 256); + OPENAL_SetPaused(channels[firestartsound], false); } objects.onfire[i]=1; } @@ -6082,9 +5734,9 @@ void Person::DoStuff(){ vel[1]=0; vel[2]=0; PlaySoundEx( firestartsound, samp[firestartsound], NULL, true); - FSOUND_3D_SetAttributes(channels[firestartsound], gLoc, vel); - FSOUND_SetVolume(channels[firestartsound], 256); - FSOUND_SetPaused(channels[firestartsound], false); + OPENAL_3D_SetAttributes(channels[firestartsound], gLoc, vel); + OPENAL_SetVolume(channels[firestartsound], 256); + OPENAL_SetPaused(channels[firestartsound], false); } objects.onfire[i]=1; } @@ -6107,9 +5759,9 @@ void Person::DoStuff(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( bushrustle, samp[bushrustle], NULL, true); - FSOUND_3D_SetAttributes(channels[bushrustle], gLoc, vel); - FSOUND_SetVolume(channels[bushrustle], 40*findLength(&velocity)); - FSOUND_SetPaused(channels[bushrustle], false); + OPENAL_3D_SetAttributes(channels[bushrustle], gLoc, vel); + OPENAL_SetVolume(channels[bushrustle], 40*findLength(&velocity)); + OPENAL_SetPaused(channels[bushrustle], false); if(id==0){ envsound[numenvsounds]=coords; @@ -6132,8 +5784,8 @@ void Person::DoStuff(){ pos.x+=float(abs(Random()%100)-50)/200; pos.y+=float(abs(Random()%100)-50)/200; pos.z+=float(abs(Random()%100)-50)/200; - sprites.MakeSprite(splintersprite, pos,tempvel*.5+velocity*float(abs(Random()%100))/100, 165/255+float(abs(Random()%100)-50)/400,0,0, .2+float(abs(Random()%100)-50)/1300, 1); - sprites.special[sprites.numsprites-1]=1; + Sprite::MakeSprite(splintersprite, pos,tempvel*.5+velocity*float(abs(Random()%100))/100, 165/255+float(abs(Random()%100)-50)/400,0,0, .2+float(abs(Random()%100)-50)/1300, 1); + Sprite::setLastSpriteSpecial(1); } howmany=findLength(&velocity)*4; if(detail==2) @@ -6147,8 +5799,8 @@ void Person::DoStuff(){ pos.x+=float(abs(Random()%100)-50)/200; pos.y+=float(abs(Random()%100)-50)/200; pos.z+=float(abs(Random()%100)-50)/200; - sprites.MakeSprite(splintersprite, pos,tempvel*.3+velocity*float(abs(Random()%100))/100/2, 1,1,1, .1, 1); - sprites.special[sprites.numsprites-1]=2; + Sprite::MakeSprite(splintersprite, pos,tempvel*.3+velocity*float(abs(Random()%100))/100/2, 1,1,1, .1, 1); + Sprite::setLastSpriteSpecial(2); } } objects.rotx[i]+=velocity.x*multiplier*6; @@ -6165,23 +5817,6 @@ void Person::DoStuff(){ tempcoord+=objects.position[i]; } if(findDistancefastflat(&tempcoord,&objects.position[i])objects.position[i].y+3*objects.scale[i]){ - /*if(onfire){ - if(!objects.onfire[i]){ - float gLoc[3]; - float vel[3]; - gLoc[0]=objects.position[i].x; - gLoc[1]=objects.position[i].y; - gLoc[2]=objects.position[i].z; - vel[0]=0; - vel[1]=0; - vel[2]=0; - PlaySoundEx( firestartsound, samp[firestartsound], NULL, true); - FSOUND_3D_SetAttributes(channels[firestartsound], gLoc, vel); - FSOUND_SetVolume(channels[firestartsound], 256); - FSOUND_SetPaused(channels[firestartsound], false); - objects.onfire[i]=1; - } - }*/ if(objects.messedwith[i]<=0){ XYZ tempvel; XYZ pos; @@ -6195,9 +5830,9 @@ void Person::DoStuff(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( bushrustle, samp[bushrustle], NULL, true); - FSOUND_3D_SetAttributes(channels[bushrustle], gLoc, vel); - FSOUND_SetVolume(channels[bushrustle], 40*findLength(&velocity)); - FSOUND_SetPaused(channels[bushrustle], false); + OPENAL_3D_SetAttributes(channels[bushrustle], gLoc, vel); + OPENAL_SetVolume(channels[bushrustle], 40*findLength(&velocity)); + OPENAL_SetPaused(channels[bushrustle], false); if(id==0){ envsound[numenvsounds]=coords; @@ -6221,8 +5856,8 @@ void Person::DoStuff(){ pos.x+=float(abs(Random()%100)-50)/150; pos.y+=float(abs(Random()%100)-50)/150; pos.z+=float(abs(Random()%100)-50)/150; - sprites.MakeSprite(splintersprite, pos,tempvel*.5+velocity*float(abs(Random()%100))/100, 165/255+float(abs(Random()%100)-50)/400,0,0, .2+float(abs(Random()%100)-50)/1300, 1); - sprites.special[sprites.numsprites-1]=1; + Sprite::MakeSprite(splintersprite, pos,tempvel*.5+velocity*float(abs(Random()%100))/100, 165/255+float(abs(Random()%100)-50)/400,0,0, .2+float(abs(Random()%100)-50)/1300, 1); + Sprite::setLastSpriteSpecial(1); } howmany=findLength(&velocity)*4; if(detail==2) @@ -6237,8 +5872,8 @@ void Person::DoStuff(){ pos.x+=float(abs(Random()%100)-50)/150; pos.y+=float(abs(Random()%100)-50)/150; pos.z+=float(abs(Random()%100)-50)/150; - sprites.MakeSprite(splintersprite, pos,tempvel*.3+velocity*float(abs(Random()%100))/100/2, 1,1,1, .1, 1); - sprites.special[sprites.numsprites-1]=2; + Sprite::MakeSprite(splintersprite, pos,tempvel*.3+velocity*float(abs(Random()%100))/100/2, 1,1,1, .1, 1); + Sprite::setLastSpriteSpecial(2); } } objects.messedwith[i]=.5; @@ -6275,14 +5910,12 @@ void Person::DoStuff(){ } } speechdelay=.3; - //else if(animation[targetanimation].label[targetframe]==4)whichsound=knifeswishsound; - //if(animation[targetanimation].label[targetframe]==8)whichsound=landsound2; if(whichsound!=-1){ PlaySoundEx( whichsound, samp[whichsound], NULL, true); - FSOUND_3D_SetAttributes(channels[whichsound], gLoc, vel); - FSOUND_SetVolume(channels[whichsound], 512); - FSOUND_SetPaused(channels[whichsound], false); + OPENAL_3D_SetAttributes(channels[whichsound], gLoc, vel); + OPENAL_SetVolume(channels[whichsound], 512); + OPENAL_SetPaused(channels[whichsound], false); } } @@ -6448,7 +6081,7 @@ void Person::DoStuff(){ flatfacing=DoRotation(flatfacing,0,rotation,0); facing=flatfacing; - ReflectVector(&facing,&terrainnormal); + ReflectVector(&facing,terrainnormal); Normalise(&facing); if(isRun()||targetanimation==sneakanim||targetanimation==rollanim||targetanimation==walkanim){ @@ -6501,7 +6134,7 @@ void Person::DoStuff(){ velocity*=velspeed; } velocity.y+=gravity*multiplier*20; - ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z)); + ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z)); velspeed=findLength(&velocity); velocity=flatfacing*velspeed; } @@ -6515,7 +6148,7 @@ void Person::DoStuff(){ velocity*=velspeed; } velocity.y+=gravity*multiplier*20; - ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z)); + ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z)); velspeed=findLength(&velocity); if(velspeedspeed*55*scale){ - velocity/=velspeed; - velspeed=speed*55*scale; - velocity*=velspeed; - } - velocity.y+=gravity*multiplier*20; - ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z)); - velspeed=findLength(&velocity); - velocity=flatfacing*velspeed; - }*/ - if(targetanimation==rollanim&&animation[targetanimation].label[targetframe]!=6){ velocity+=facing*multiplier*speed*700*scale; velspeed=findLength(&velocity); @@ -6568,7 +6186,7 @@ void Person::DoStuff(){ velocity*=velspeed; } velocity.y+=gravity*multiplier*20; - ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z)); + ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z)); velspeed=findLength(&velocity); velocity=flatfacing*velspeed; } @@ -6583,7 +6201,7 @@ void Person::DoStuff(){ velocity*=velspeed; } velocity.y+=gravity*multiplier*20; - ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z)); + ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z)); velspeed=findLength(&velocity); velocity=flatfacing*velspeed; }*/ @@ -6597,7 +6215,7 @@ void Person::DoStuff(){ velocity*=velspeed; } velocity.y+=gravity*multiplier*20; - ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z)); + ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z)); velspeed=findLength(&velocity); velocity=flatfacing*velspeed; } @@ -6611,7 +6229,7 @@ void Person::DoStuff(){ velocity*=velspeed; } velocity.y+=gravity*multiplier*20; - ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z)); + ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z)); velspeed=findLength(&velocity); velocity=flatfacing*velspeed; } @@ -6626,7 +6244,7 @@ void Person::DoStuff(){ velocity*=velspeed; } velocity.y+=gravity*multiplier*20; - ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z)); + ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z)); velspeed=findLength(&velocity); velocity=flatfacing*velspeed*-1; } @@ -6640,7 +6258,7 @@ void Person::DoStuff(){ velocity*=velspeed; } velocity.y+=gravity*multiplier*20; - ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z)); + ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z)); velspeed=findLength(&velocity); velocity=DoRotation(flatfacing*velspeed,0,-90,0); } @@ -6664,7 +6282,7 @@ void Person::DoStuff(){ velocity*=velspeed; } velocity.y+=gravity*multiplier*20; - ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z)); + ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z)); velspeed=findLength(&velocity); velocity=flatfacing*velspeed*-1; } @@ -6678,7 +6296,7 @@ void Person::DoStuff(){ velocity*=velspeed; } velocity.y+=gravity*multiplier*20; - ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z)); + ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z)); velspeed=findLength(&velocity); velocity=flatfacing*velspeed*-1; } @@ -6703,8 +6321,8 @@ void Person::DoStuff(){ onterrain=1; if(id==0){ - FSOUND_SetPaused(channels[whooshsound], true); - FSOUND_SetVolume(channels[whooshsound], 0); + OPENAL_SetPaused(channels[whooshsound], true); + OPENAL_SetVolume(channels[whooshsound], 0); } if(targetanimation==jumpdownanim||isFlip()){ @@ -6719,9 +6337,9 @@ void Person::DoStuff(){ vel[1]=velocity.y; vel[2]=velocity.z; PlaySoundEx( landsound, samp[landsound], NULL, true); - FSOUND_3D_SetAttributes(channels[landsound], gLoc, vel); - FSOUND_SetVolume(channels[landsound], 128); - FSOUND_SetPaused(channels[landsound], false); + OPENAL_3D_SetAttributes(channels[landsound], gLoc, vel); + OPENAL_SetVolume(channels[landsound], 128); + OPENAL_SetPaused(channels[landsound], false); if(id==0){ envsound[numenvsounds]=coords; @@ -6787,15 +6405,15 @@ void Person::DoStuff(){ vel[2]=velocity.z; if(!onterrain||environment==grassyenvironment){ PlaySoundEx( skidsound, samp[skidsound], NULL, true); - FSOUND_3D_SetAttributes(channels[skidsound], gLoc, vel); - FSOUND_SetVolume(channels[skidsound], 128*velspeed/10); - FSOUND_SetPaused(channels[skidsound], false); + OPENAL_3D_SetAttributes(channels[skidsound], gLoc, vel); + OPENAL_SetVolume(channels[skidsound], 128*velspeed/10); + OPENAL_SetPaused(channels[skidsound], false); } else { PlaySoundEx( snowskidsound, samp[snowskidsound], NULL, true); - FSOUND_3D_SetAttributes(channels[snowskidsound], gLoc, vel); - FSOUND_SetVolume(channels[snowskidsound], 128*velspeed/10); - FSOUND_SetPaused(channels[snowskidsound], false); + OPENAL_3D_SetAttributes(channels[snowskidsound], gLoc, vel); + OPENAL_SetVolume(channels[snowskidsound], 128*velspeed/10); + OPENAL_SetPaused(channels[snowskidsound], false); } } @@ -6863,9 +6481,12 @@ int Person::DrawSkeleton(){ if(findDistancefast(&viewer,&coords)