]> git.jsancho.org Git - lugaru.git/blobdiff - Source/Person.cpp
Drop last remains of PlaySoundEx from Person.cpp
[lugaru.git] / Source / Person.cpp
index 30d4f47aa3d6a7507d1ab690b135423237cd70da..3ee97382eb4ad4c48aa033c3eb3dda39408b4a49 100644 (file)
@@ -86,9 +86,6 @@ extern int indialogue;
 
 extern bool gamestarted;
 
-extern "C"     void PlaySoundEx(int channel, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused);
-extern "C" void PlayStreamEx(int chan, OPENAL_STREAM *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused);
-
 void Person::CheckKick(){
        static XYZ relative;
        static int i;
@@ -223,56 +220,18 @@ int Person::getStop(){
        return 0;
 }
 
-
-bool Person::isLanding(){
-       if(targetanimation==landanim||targetanimation==wolflandanim)return 1;
-       else return 0;
-}
-
-
-bool Person::wasLanding(){
-       if(currentanimation==landanim||currentanimation==wolflandanim)return 1;
-       else return 0;
-}
 int Person::getLanding(){
        if(creature==rabbittype)return landanim;
        if(creature==wolftype)return wolflandanim;
        return 0;
 }
 
-
-bool Person::isLandhard(){
-       if(targetanimation==landhardanim||targetanimation==wolflandhardanim)return 1;
-       else return 0;
-}
-
-
-bool Person::wasLandhard(){
-       if(currentanimation==landhardanim||currentanimation==wolflandhardanim)return 1;
-       else return 0;
-}
 int Person::getLandhard(){
        if(creature==rabbittype)return landhardanim;
        if(creature==wolftype)return wolflandhardanim;
        return 0;
 }
 
-
-bool Person::isFlip(){
-       if(targetanimation==flipanim||targetanimation==frontflipanim||targetanimation==backflipanim||targetanimation==rightflipanim||targetanimation==leftflipanim||targetanimation==walljumprightkickanim||targetanimation==walljumpleftkickanim)return 1;
-       else return 0;
-}
-
-bool Person::wasFlip(){
-       if(currentanimation==flipanim||currentanimation==frontflipanim||currentanimation==backflipanim||currentanimation==rightflipanim||currentanimation==leftflipanim||currentanimation==walljumprightkickanim||currentanimation==walljumpleftkickanim)return 1;
-       else return 0;
-}
-
-bool Person::isWallJump(){
-       if(targetanimation==walljumpfrontanim||targetanimation==walljumpbackanim||targetanimation==walljumpleftanim||targetanimation==walljumprightanim)return 1;
-       else return 0;
-}
-
 static void
 SolidHitBonus(int playerid)
 {
@@ -1064,10 +1023,6 @@ void Person::Reverse(){
 
 
 
-                                       /*PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, true);
-                                       OPENAL_3D_SetAttributes(channels[metalhitsound], gLoc, vel);
-                                       OPENAL_SetVolume(channels[metalhitsound], 512);
-                                       OPENAL_SetPaused(channels[metalhitsound], false);*/
                                }
 
                                if(abs(Random()%20)==0){
@@ -1111,10 +1066,6 @@ void Person::Reverse(){
                                 }
 
 
-                                       /*PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, true);
-                                       OPENAL_3D_SetAttributes(channels[metalhitsound], gLoc, vel);
-                                       OPENAL_SetVolume(channels[metalhitsound], 512);
-                                       OPENAL_SetPaused(channels[metalhitsound], false);*/
                                }
                        }
                        if(hasvictim)
@@ -1664,14 +1615,6 @@ void     Person::DoAnimations(){
                        if(tutoriallevel!=1||id==0)
                                if((animation[targetanimation].label[targetframe]&&(animation[targetanimation].label[targetframe]<5||animation[targetanimation].label[targetframe]==8))/*||(targetanimation==rollanim&&targetframe==animation[rollanim].numframes-1)*/){
                                        int whichsound;
-                                       float gLoc[3];
-                                       float vel[3];
-                                       gLoc[0]=coords.x;
-                                       gLoc[1]=coords.y;
-                                       gLoc[2]=coords.z;
-                                       vel[0]=velocity.x;
-                                       vel[1]=velocity.y;
-                                       vel[2]=velocity.z;
                                        if(onterrain){
                                                if(terrain.getOpacity(coords.x,coords.z)<.2){
                                                        if(animation[targetanimation].label[targetframe]==1)whichsound=footstepsound;
@@ -1705,12 +1648,7 @@ void     Person::DoAnimations(){
                                        else if(animation[targetanimation].label[targetframe]==4)whichsound=knifeswishsound;
                                        if(animation[targetanimation].label[targetframe]==8&&tutoriallevel!=1)whichsound=landsound2;
 
-                                       PlaySoundEx( whichsound, samp[whichsound], NULL, true);
-                                       OPENAL_3D_SetAttributes(channels[whichsound], gLoc, vel);
-                                       if(whichsound!=knifeswishsound)OPENAL_SetVolume(channels[whichsound], 128);
-                                       if(whichsound!=knifeswishsound&&(targetanimation==staffhitanim||targetanimation==staffgroundsmashanim||targetanimation==staffspinhitanim))OPENAL_SetVolume(channels[whichsound], 256);
-                                       if(whichsound==knifeswishsound)OPENAL_SetVolume(channels[whichsound], 512);
-                                       OPENAL_SetPaused(channels[whichsound], false);
+                                       emit_sound_at(whichsound, coords, 256.);
 
                                        if(id==0)
                                                if(whichsound==footstepsound||whichsound==footstepsound2||whichsound==footstepsound3||whichsound==footstepsound4){
@@ -2668,11 +2606,6 @@ void     Person::DoAnimations(){
                                                                                                player[i].wentforweapon=0;
                                                                                        }
 
-                                                                                       /*PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, true);
-                                                                                       OPENAL_3D_SetAttributes(channels[metalhitsound], gLoc, vel);
-                                                                                       OPENAL_SetVolume(channels[metalhitsound], 512);
-                                                                                       OPENAL_SetPaused(channels[metalhitsound], false);*/
-
                                                                                }
                                                                        }
                                                                }
@@ -6411,281 +6344,3 @@ int Person::SphereCheck(XYZ *p1,float radius, XYZ *p, XYZ *move, float *rotate,
        *p1+=*move;
        return firstintersecting;
 }
-
-Person::Person()
-{
-       whichpatchx = 0;
-       whichpatchz = 0;
-
-       currentframe = 0;
-       targetframe = 0;
-       currentanimation = 0;
-       targetanimation = 0;
-       oldcurrentframe = 0;
-       oldtargetframe = 0;
-       oldcurrentanimation = 0;
-       oldtargetanimation = 0;
-
-       howactive = 0;
-
-       parriedrecently = 0;
-
-       superruntoggle = 0;
-
-       lastattack = 0,lastattack2 = 0,lastattack3 = 0;
-
-       currentoffset = 0,targetoffset = 0,offset = 0;
-       target = 0;
-       transspeed = 0;
-
-       realoldcoords = 0;
-       oldcoords = 0;
-       coords = 0;
-       originalcoords = 0;
-       velocity = 0;
-
-       proportionhead = 0;
-       proportionlegs = 0;
-       proportionarms = 0;
-       proportionbody = 0;
-
-       heightleft = 0;
-       heightright = 0;
-
-       unconscioustime = 0;
-
-       immobile = 0;
-
-       velspeed = 0;
-       targetrotation = 0;
-       targetrot = 0;
-       rot = 0;
-       oldrot = 0;
-       lookrotation = 0;
-       lookrotation2 = 0;
-       rotation = 0;
-       rotation2 = 0;
-       lowrotation = 0;
-       tilt = 0;
-       targettilt = 0;
-       tilt2 = 0;
-       targettilt2 = 0;
-       rabbitkickenabled = 0;
-
-       bloodloss = 0;
-       bleeddelay = 0;
-       skiddelay = 0;
-       skiddingdelay = 0;
-       deathbleeding = 0;
-       tempdeltav = 0;
-
-       damagetolerance = 0;
-       damage = 0;
-       permanentdamage = 0;
-       superpermanentdamage = 0;       lastcollide = 0;
-       dead = 0;
-
-       jumppower = 0;
-       onground = 0;
-       madskills = 0;
-
-       wentforweapon = 0;
-
-       calcrot = 0;
-
-       backwardsanim = 0;
-
-       facing = 0;
-
-       bleeding = 0;
-       bleedx = 0,bleedy;
-       direction = 0;
-       texupdatedelay = 0;
-
-       headrotation = 0,headrotation2 = 0;
-       targetheadrotation = 0,targetheadrotation2 = 0;
-
-       onterrain = 0;
-       pause = 0;
-
-       grabdelay = 0;
-
-       victim = 0;
-       hasvictim = 0;
-
-       updatedelay = 0;
-       normalsupdatedelay = 0;
-
-       jumpstart = 0;
-
-       forwardkeydown = 0;
-       forwardstogglekeydown = 0;
-       rightkeydown = 0;
-       leftkeydown = 0;
-       backkeydown = 0;
-       jumpkeydown = 0;
-       jumptogglekeydown = 0;
-       crouchkeydown = 0;
-       crouchtogglekeydown = 0;
-       drawkeydown = 0;
-       drawtogglekeydown = 0;
-       throwkeydown = 0;
-       throwtogglekeydown = 0;
-       attackkeydown = 0;
-       feint = 0;
-       lastfeint = 0;
-       headless = 0;
-
-       crouchkeydowntime = 0;
-       jumpkeydowntime = 0;
-       freefall = 0;
-
-
-       turnspeed = 0;
-
-       aitype = 0;
-       aitarget = 0;
-       aiupdatedelay = 0;
-       losupdatedelay = 0;
-       ally = 0;
-       movetarget = 0;
-       collide = 0;
-       collided = 0;
-       avoidcollided = 0;
-       loaded = 0;
-       whichdirection = 0;
-       whichdirectiondelay = 0;
-       avoidsomething = 0;     avoidwhere = 0;
-       blooddimamount = 0;
-
-       staggerdelay = 0;
-       blinkdelay = 0;
-       twitchdelay = 0;
-       twitchdelay2 = 0;
-       twitchdelay3 = 0;
-       lefthandmorphness = 0;
-       righthandmorphness = 0;
-       headmorphness = 0;
-       chestmorphness = 0;
-       tailmorphness = 0;
-       targetlefthandmorphness = 0;
-       targetrighthandmorphness = 0;
-       targetheadmorphness = 0;
-       targetchestmorphness = 0;
-       targettailmorphness = 0;
-       lefthandmorphstart = 0,lefthandmorphend = 0;
-       righthandmorphstart = 0,righthandmorphend = 0;
-       headmorphstart = 0,headmorphend = 0;
-       chestmorphstart = 0,chestmorphend = 0;
-       tailmorphstart = 0,tailmorphend = 0;
-
-       weaponmissdelay = 0;
-       highreversaldelay = 0;
-       lowreversaldelay = 0;
-       nocollidedelay = 0;
-
-       creature = 0;
-
-       id = 0;
-
-       //Skeleton skeleton;
-
-       speed = 0;
-       scale = 0;
-       power = 0;
-       speedmult = 0;
-
-       protectionhead = 0;
-       protectionhigh = 0;
-       protectionlow = 0;
-       armorhead = 0;
-       armorhigh = 0;
-       armorlow = 0;
-       metalhead = 0;
-       metalhigh = 0;
-       metallow = 0;
-
-       numclothes = 0;
-
-       memset(clothes, 0, sizeof(clothes));
-       memset(clothestintr, 0, sizeof(clothestintr));
-       memset(clothestintg, 0, sizeof(clothestintg));
-       memset(clothestintb, 0, sizeof(clothestintb));
-
-       landhard = 0;
-       bled = 0;
-       spurt = 0;
-       onfire = 0;
-       onfiredelay = 0;        burnt = 0;
-       fireduration = 0;
-
-       flamedelay = 0;
-       updatestuffdelay = 0;
-
-       playerdetail = 0;
-
-       num_weapons = 0;
-
-       memset(weaponids, 0, sizeof(weaponids));
-
-       weaponactive = 0;
-       weaponstuck = 0;
-       weaponstuckwhere = 0;
-       weaponwhere = 0;
-
-       numwaypoints = 0;
-
-       memset(waypoints, 0, sizeof(waypoints));
-       memset(waypointtype, 0, sizeof(waypointtype));
-
-       pausetime = 0;
-       hastempwaypoint = 0;
-       tempwaypoint = 0;
-
-       headtarget = 0;
-       interestdelay = 0;
-
-       finalfinaltarget = 0;
-       finaltarget = 0;
-       finalpathfindpoint = 0;
-       targetpathfindpoint = 0;
-       lastpathfindpoint = 0;
-       lastpathfindpoint2 = 0;
-       lastpathfindpoint3 = 0;
-       lastpathfindpoint4 = 0;
-       onpath = 0;
-
-       waypoint = 0;
-       jumppath = 0;
-
-       lastseen = 0;
-       lastseentime = 0;
-       lastchecktime = 0;
-       stunned = 0;
-       surprised = 0;
-       runninghowlong = 0;     lastoccluded = 0;
-       laststanding = 0;
-       escapednum = 0;
-
-       speechdelay = 0;
-       neckspurtdelay = 0;
-       neckspurtparticledelay = 0;
-       neckspurtamount = 0;
-
-       whichskin = 0;
-       rabbitkickragdoll = 0;
-
-       averageloc = 0;
-       oldaverageloc = 0;
-
-       //Animation tempanimation;
-
-       occluded = 0;
-
-       jumpclimb = 0;
-}
-
-Person::~Person()
-{
-}
-