X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FPerson.cpp;h=47212bd59ac3eee01265620103cc9898e86e4f63;hb=bbf8873b80baf3cb468ac12b3f62b0938320fef1;hp=107edb4f436f80b8882a6943aa9bbc40017c105a;hpb=6f3fa5a970fa12cf6529c56a1f859b2668a8a232;p=lugaru.git diff --git a/Source/Person.cpp b/Source/Person.cpp index 107edb4..47212bd 100644 --- a/Source/Person.cpp +++ b/Source/Person.cpp @@ -28,7 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "Game.h" extern float multiplier; -extern int channels[100]; extern Terrain terrain; extern float gravity; extern int environment; @@ -49,7 +48,6 @@ extern bool osx; extern bool autoslomo; extern float camerashake; extern float woozy; -extern float terraindetail; extern float viewdistance; extern float blackout; extern int difficulty; @@ -67,7 +65,6 @@ extern bool tiltweird; extern bool midweird; extern bool proportionweird; extern bool vertexweird[6]; -extern GLubyte texturearray[512*512*3]; extern XYZ envsound[30]; extern float envsoundvol[30]; extern float envsoundlife[30]; @@ -86,69 +83,67 @@ extern int indialogue; extern bool gamestarted; -extern "C" void PlaySoundEx(int channel, OPENAL_SAMPLE *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused); -extern "C" void PlayStreamEx(int chan, OPENAL_STREAM *sptr, OPENAL_DSPUNIT *dsp, signed char startpaused); - -void Person::CheckKick(){ - static XYZ relative; - static int i; - - float damagemult=1*power; - if(creature==wolftype)damagemult=2.5*power; - damagemult*=power; - - if(hasvictim) - if(targetanimation==rabbitkickanim&&victim&&victim!=this&¤tframe>=2&¤tanimation==rabbitkickanim){ - if(findDistancefast(&coords,&victim->coords)<1.2){ - if(!victim->skeleton.free){ - relative=velocity; - Normalise(&relative); - relative=coords+relative*1; - if(animation[victim->targetanimation].height!=lowheight){ - victim->spurt=1; - DoBlood(.2,250); - if(tutoriallevel!=1) - emit_sound_at(heavyimpactsound, victim->coords); - victim->RagDoll(0); - relative=velocity; - relative.y=0; - Normalise(&relative); - for(i=0;iskeleton.num_joints;i++){ - victim->skeleton.joints[i].velocity+=relative*120*damagemult; - } - victim->Puff(neck); - victim->DoDamage(100*damagemult/victim->protectionhigh); - if(id==0)camerashake+=.4; +Person player[maxplayers]; - target=0; - currentframe=3; - targetanimation=backflipanim; - targetframe=4; - velocity=facing*-10; - velocity.y=5; - skeleton.free=0; - if(id==0)OPENAL_SetPaused(channels[whooshsound], false); - - award_bonus(id, cannon); - } - else if (victim->isCrouch()){ - targetanimation=rabbitkickreversedanim; - currentanimation=rabbitkickreversedanim; - victim->currentanimation=rabbitkickreversalanim; - victim->targetanimation=rabbitkickreversalanim; - targettilt2=0; - currentframe=0; - targetframe=1; - target=0; - velocity=0; - victim->oldcoords=victim->coords; - coords=victim->coords; - victim->targetrotation=targetrotation; - victim->victim=this; - } - } - } - } +void Person::CheckKick() +{ + if (!(hasvictim + && (targetanimation == rabbitkickanim + && victim + && victim != this + && currentframe >= 2 + && currentanimation == rabbitkickanim) + && (findDistancefast(&coords,&victim->coords) < 1.2) + && (!victim->skeleton.free))) + return; + + if (animation[victim->targetanimation].height!=lowheight) + { + float damagemult = (creature == wolftype ? 2.5 : 1.) * power * power; + XYZ relative = velocity; + relative.y=0; + Normalise(&relative); + + victim->spurt=1; + DoBlood(.2,250); + if(tutoriallevel!=1) + emit_sound_at(heavyimpactsound, victim->coords); + victim->RagDoll(0); + for(int i=0;iskeleton.num_joints;i++){ + victim->skeleton.joints[i].velocity+=relative*120*damagemult; + } + victim->Puff(neck); + victim->DoDamage(100*damagemult/victim->protectionhigh); + if(id==0)camerashake+=.4; + + target=0; + currentframe=3; + targetanimation=backflipanim; + targetframe=4; + velocity=facing*-10; + velocity.y=5; + skeleton.free=0; + if(id==0) + resume_stream(whooshsound); + + award_bonus(id, cannon); + } + else if (victim->isCrouch()) + { + targetanimation=rabbitkickreversedanim; + currentanimation=rabbitkickreversedanim; + victim->currentanimation=rabbitkickreversalanim; + victim->targetanimation=rabbitkickreversalanim; + targettilt2=0; + currentframe=0; + targetframe=1; + target=0; + velocity=0; + victim->oldcoords=victim->coords; + coords=victim->coords; + victim->targetrotation=targetrotation; + victim->victim=this; + } } void Person::CatchFire(){ @@ -235,12 +230,6 @@ int Person::getLandhard(){ return 0; } - -bool Person::isWallJump(){ - if(targetanimation==walljumpfrontanim||targetanimation==walljumpbackanim||targetanimation==walljumpleftanim||targetanimation==walljumprightanim)return 1; - else return 0; -} - static void SolidHitBonus(int playerid) { @@ -486,8 +475,7 @@ void Person::DoBloodBig(float howmuch,int which){ } } glBindTexture(GL_TEXTURE_2D,skeleton.drawmodel.textureptr); - if(detail!=2||osx)DoMipmaps(5,0,0,skeleton.skinsize,skeleton.skinsize); - else DoMipmaps(0,startx/realtexdetail,endx/realtexdetail,starty/realtexdetail,endy/realtexdetail); + DoMipmaps(); bleedxint=0; bleedyint=0; @@ -715,8 +703,7 @@ bool Person::DoBloodBigWhere(float howmuch,int which, XYZ where){ } } glBindTexture(GL_TEXTURE_2D,skeleton.drawmodel.textureptr); - if(detail!=2||osx)DoMipmaps(5,0,0,skeleton.skinsize,skeleton.skinsize); - else DoMipmaps(0,startx/realtexdetail,endx/realtexdetail,starty/realtexdetail,endy/realtexdetail); + DoMipmaps(); bleedy=(1+coordsy)*512; bleedx=coordsx*512; @@ -746,398 +733,326 @@ bool Person::DoBloodBigWhere(float howmuch,int which, XYZ where){ } -void Person::DoMipmaps(int howmanylevels,float startx, float endx, float starty, float endy){ - int i,j,k; - static float temp; - static int bytesPerPixel=3; - static int newsize,totalsize,rowsize,bigstep,smallstep,sum; - static int newstartx,newstarty,newendx,newendy; - static int newnewstartx,newnewstarty,newnewendx,newnewendy; - static int which; - static float sizemult; - /* - for(i=0;iskeleton.skinsize-1)endx=skeleton.skinsize-1; - if(endy>skeleton.skinsize-1)endy=skeleton.skinsize-1; - if((endx>startx&&endy>starty)||howmanylevels){ - - newstartx=startx; - newstarty=starty; - newendx=endx; - newendy=endy; - - for(i=startx;iaitype == playercontrolled + || hostiletime > 1 + || staggerdelay <= 0) + && victim->targetanimation != jumpupanim + && victim->targetanimation != jumpdownanim + && (tutoriallevel != 1 || cananger) + && hostile)) + return; + + if (normaldotproduct (victim->facing, victim->coords-coords) > 0 + && (victim->id != 0 || difficulty >= 2) + && (creature != wolftype || victim->creature == wolftype)) + return; + + if(targetanimation==sweepanim){ + targetanimation=sweepreversedanim; + currentanimation=sweepreversedanim; + victim->currentanimation=sweepreversalanim; + victim->targetanimation=sweepreversalanim; + } + if(targetanimation==spinkickanim){ + targetanimation=spinkickreversedanim; + currentanimation=spinkickreversedanim; + victim->currentanimation=spinkickreversalanim; + victim->targetanimation=spinkickreversalanim; + } + if(targetanimation==upunchanim||targetanimation==rabbittacklinganim){ + if(targetanimation==rabbittacklinganim){ + currentframe=6; + targetframe=7; + victim->currentframe=6; + victim->targetframe=7; + } + targetanimation=upunchreversedanim; + currentanimation=upunchreversedanim; + victim->currentanimation=upunchreversalanim; + victim->targetanimation=upunchreversalanim; + } + if(targetanimation==staffhitanim&&findDistancefast(&victim->coords,&coords)<2&&((victim->id==0&&victim->crouchkeydown)||Random()%4==0)){ + if(victim->weaponactive!=-1){ + victim->throwtogglekeydown=1; + weapons.owner[victim->weaponids[0]]=-1; + weapons.velocity[victim->weaponids[0]]=victim->velocity*.2; + if(weapons.velocity[victim->weaponids[0]].x==0)weapons.velocity[victim->weaponids[0]].x=.1; + weapons.tipvelocity[victim->weaponids[0]]=weapons.velocity[victim->weaponids[0]]; + weapons.missed[victim->weaponids[0]]=1; + weapons.freetime[victim->weaponids[0]]=0; + weapons.firstfree[victim->weaponids[0]]=1; + weapons.physics[victim->weaponids[0]]=1; + victim->num_weapons--; + if(victim->num_weapons){ + victim->weaponids[0]=victim->weaponids[victim->num_weapons]; + if(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0; + } + + victim->weaponactive=-1; + for(int j=0;jcurrentanimation=staffhitreversalanim; + victim->targetanimation=staffhitreversalanim; + } + if(targetanimation==staffspinhitanim&&findDistancefast(&victim->coords,&coords)<2&&((victim->id==0&&victim->crouchkeydown)||Random()%2==0)){ + if(victim->weaponactive!=-1){ + victim->throwtogglekeydown=1; + weapons.owner[victim->weaponids[0]]=-1; + weapons.velocity[victim->weaponids[0]]=victim->velocity*.2; + if(weapons.velocity[victim->weaponids[0]].x==0)weapons.velocity[victim->weaponids[0]].x=.1; + weapons.tipvelocity[victim->weaponids[0]]=weapons.velocity[victim->weaponids[0]]; + weapons.missed[victim->weaponids[0]]=1; + weapons.freetime[victim->weaponids[0]]=0; + weapons.firstfree[victim->weaponids[0]]=1; + weapons.physics[victim->weaponids[0]]=1; + victim->num_weapons--; + if(victim->num_weapons){ + victim->weaponids[0]=victim->weaponids[victim->num_weapons]; + if(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0; + } + + victim->weaponactive=-1; + for(int j=0;jcurrentanimation=staffspinhitreversalanim; + victim->targetanimation=staffspinhitreversalanim; + } + if(targetanimation==swordslashanim&&findDistancefast(&victim->coords,&coords)<2&&((victim->id==0&&victim->crouchkeydown)||Random()%4==0)){ + if(victim->weaponactive!=-1){ + victim->throwtogglekeydown=1; + weapons.owner[victim->weaponids[0]]=-1; + weapons.velocity[victim->weaponids[0]]=victim->velocity*.2; + if(weapons.velocity[victim->weaponids[0]].x==0)weapons.velocity[victim->weaponids[0]].x=.1; + weapons.tipvelocity[victim->weaponids[0]]=weapons.velocity[victim->weaponids[0]]; + weapons.missed[victim->weaponids[0]]=1; + weapons.freetime[victim->weaponids[0]]=0; + weapons.firstfree[victim->weaponids[0]]=1; + weapons.physics[victim->weaponids[0]]=1; + victim->num_weapons--; + if(victim->num_weapons){ + victim->weaponids[0]=victim->weaponids[victim->num_weapons]; + if(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0; + } + + victim->weaponactive=-1; + for(int j=0;jcurrentanimation=swordslashreversalanim; + victim->targetanimation=swordslashreversalanim; + } + if(targetanimation==knifeslashstartanim&&findDistancefast(&victim->coords,&coords)<2&&(victim->id==0||Random()%4==0)){ + if(victim->weaponactive!=-1){ + victim->throwtogglekeydown=1; + weapons.owner[victim->weaponids[0]]=-1; + weapons.velocity[victim->weaponids[0]]=victim->velocity*.2; + if(weapons.velocity[victim->weaponids[0]].x==0)weapons.velocity[victim->weaponids[0]].x=.1; + weapons.tipvelocity[victim->weaponids[0]]=weapons.velocity[victim->weaponids[0]]; + weapons.missed[victim->weaponids[0]]=1; + weapons.freetime[victim->weaponids[0]]=0; + weapons.firstfree[victim->weaponids[0]]=1; + weapons.physics[victim->weaponids[0]]=1; + victim->num_weapons--; + if(victim->num_weapons){ + victim->weaponids[0]=victim->weaponids[victim->num_weapons]; + if(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0; + } + + victim->weaponactive=-1; + for(int j=0;jcurrentanimation=knifeslashreversalanim; + victim->targetanimation=knifeslashreversalanim; + } + if(targetanimation!=knifeslashstartanim&&targetanimation!=staffhitanim&&targetanimation!=staffspinhitanim&&targetanimation!=winduppunchanim&&targetanimation!=wolfslapanim&&targetanimation!=swordslashanim&&targetanimation!=swordslashanim){ + victim->targettilt2=targettilt2; + victim->currentframe=currentframe; + victim->targetframe=targetframe; + victim->target=target; + victim->velocity=0; + victim->oldcoords=victim->coords; + victim->coords=coords; + victim->targetrotation=targetrotation; + victim->rotation=targetrotation; + victim->victim=this; + } + if(targetanimation==winduppunchanim){ + targetanimation=winduppunchblockedanim; + victim->targetanimation=blockhighleftanim; + victim->targetframe=1; + victim->target=.5; + victim->victim=this; + victim->targetrotation=targetrotation+180; + } + if(targetanimation==wolfslapanim){ + targetanimation=winduppunchblockedanim; + victim->targetanimation=blockhighleftanim; + victim->targetframe=1; + victim->target=.5; + victim->victim=this; + victim->targetrotation=targetrotation+180; + } + if((targetanimation==swordslashanim||targetanimation==staffhitanim||targetanimation==staffspinhitanim)&&victim->weaponactive!=-1){ + targetanimation=swordslashparriedanim; + parriedrecently=.4; + victim->parriedrecently=0; + victim->targetanimation=swordslashparryanim; + victim->targetframe=1; + victim->target=.5; + victim->victim=this; + victim->targetrotation=targetrotation+180; + + if(abs(Random()%20)==0||weapons.type[victim->weaponids[victim->weaponactive]]==knife){ + if(victim->weaponactive!=-1){ + if(weapons.type[victim->weaponids[0]]==staff||weapons.type[weaponids[0]]==staff){ + if(weapons.type[victim->weaponids[0]]==staff)weapons.damage[victim->weaponids[0]]+=.2+float(abs(Random()%100)-50)/250; + if(weapons.type[weaponids[0]]==staff)weapons.damage[weaponids[0]]+=.2+float(abs(Random()%100)-50)/250; + emit_sound_at(swordstaffsound, victim->coords); } -} - - -void Person::Reverse(){ - if(victim->aitype==playercontrolled||hostiletime>1) - if(victim->targetanimation!=jumpupanim&&victim->targetanimation!=jumpdownanim&&((tutoriallevel!=1||cananger)&&hostile)){ - if(normaldotproduct(victim->facing,victim->coords-coords)>0&&!(victim->id==0&&difficulty<2)&&(creature!=wolftype||victim->creature==wolftype))return; - if(victim->aitype!=playercontrolled&&staggerdelay>0)return; - if(targetanimation==sweepanim){ - targetanimation=sweepreversedanim; - currentanimation=sweepreversedanim; - victim->currentanimation=sweepreversalanim; - victim->targetanimation=sweepreversalanim; - } - if(targetanimation==spinkickanim){ - targetanimation=spinkickreversedanim; - currentanimation=spinkickreversedanim; - victim->currentanimation=spinkickreversalanim; - victim->targetanimation=spinkickreversalanim; - } - if(targetanimation==upunchanim||targetanimation==rabbittacklinganim){ - if(targetanimation==rabbittacklinganim){ - currentframe=6; - targetframe=7; - victim->currentframe=6; - victim->targetframe=7; - } - targetanimation=upunchreversedanim; - currentanimation=upunchreversedanim; - victim->currentanimation=upunchreversalanim; - victim->targetanimation=upunchreversalanim; - } - if(targetanimation==staffhitanim&&findDistancefast(&victim->coords,&coords)<2&&((victim->id==0&&victim->crouchkeydown)||Random()%4==0)){ - if(victim->weaponactive!=-1){ - victim->throwtogglekeydown=1; - weapons.owner[victim->weaponids[0]]=-1; - weapons.velocity[victim->weaponids[0]]=victim->velocity*.2; - if(weapons.velocity[victim->weaponids[0]].x==0)weapons.velocity[victim->weaponids[0]].x=.1; - weapons.tipvelocity[victim->weaponids[0]]=weapons.velocity[victim->weaponids[0]]; - weapons.missed[victim->weaponids[0]]=1; - weapons.freetime[victim->weaponids[0]]=0; - weapons.firstfree[victim->weaponids[0]]=1; - weapons.physics[victim->weaponids[0]]=1; - victim->num_weapons--; - if(victim->num_weapons){ - victim->weaponids[0]=victim->weaponids[victim->num_weapons]; - if(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0; - } - - victim->weaponactive=-1; - for(int j=0;jcurrentanimation=staffhitreversalanim; - victim->targetanimation=staffhitreversalanim; - } - if(targetanimation==staffspinhitanim&&findDistancefast(&victim->coords,&coords)<2&&((victim->id==0&&victim->crouchkeydown)||Random()%2==0)){ - if(victim->weaponactive!=-1){ - victim->throwtogglekeydown=1; - weapons.owner[victim->weaponids[0]]=-1; - weapons.velocity[victim->weaponids[0]]=victim->velocity*.2; - if(weapons.velocity[victim->weaponids[0]].x==0)weapons.velocity[victim->weaponids[0]].x=.1; - weapons.tipvelocity[victim->weaponids[0]]=weapons.velocity[victim->weaponids[0]]; - weapons.missed[victim->weaponids[0]]=1; - weapons.freetime[victim->weaponids[0]]=0; - weapons.firstfree[victim->weaponids[0]]=1; - weapons.physics[victim->weaponids[0]]=1; - victim->num_weapons--; - if(victim->num_weapons){ - victim->weaponids[0]=victim->weaponids[victim->num_weapons]; - if(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0; - } - - victim->weaponactive=-1; - for(int j=0;jcurrentanimation=staffspinhitreversalanim; - victim->targetanimation=staffspinhitreversalanim; - } - if(targetanimation==swordslashanim&&findDistancefast(&victim->coords,&coords)<2&&((victim->id==0&&victim->crouchkeydown)||Random()%4==0)){ - if(victim->weaponactive!=-1){ - victim->throwtogglekeydown=1; - weapons.owner[victim->weaponids[0]]=-1; - weapons.velocity[victim->weaponids[0]]=victim->velocity*.2; - if(weapons.velocity[victim->weaponids[0]].x==0)weapons.velocity[victim->weaponids[0]].x=.1; - weapons.tipvelocity[victim->weaponids[0]]=weapons.velocity[victim->weaponids[0]]; - weapons.missed[victim->weaponids[0]]=1; - weapons.freetime[victim->weaponids[0]]=0; - weapons.firstfree[victim->weaponids[0]]=1; - weapons.physics[victim->weaponids[0]]=1; - victim->num_weapons--; - if(victim->num_weapons){ - victim->weaponids[0]=victim->weaponids[victim->num_weapons]; - if(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0; - } - - victim->weaponactive=-1; - for(int j=0;jcurrentanimation=swordslashreversalanim; - victim->targetanimation=swordslashreversalanim; - } - if(targetanimation==knifeslashstartanim&&findDistancefast(&victim->coords,&coords)<2&&(victim->id==0||Random()%4==0)){ - if(victim->weaponactive!=-1){ - victim->throwtogglekeydown=1; - weapons.owner[victim->weaponids[0]]=-1; - weapons.velocity[victim->weaponids[0]]=victim->velocity*.2; - if(weapons.velocity[victim->weaponids[0]].x==0)weapons.velocity[victim->weaponids[0]].x=.1; - weapons.tipvelocity[victim->weaponids[0]]=weapons.velocity[victim->weaponids[0]]; - weapons.missed[victim->weaponids[0]]=1; - weapons.freetime[victim->weaponids[0]]=0; - weapons.firstfree[victim->weaponids[0]]=1; - weapons.physics[victim->weaponids[0]]=1; - victim->num_weapons--; - if(victim->num_weapons){ - victim->weaponids[0]=victim->weaponids[victim->num_weapons]; - if(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0; - } - - victim->weaponactive=-1; - for(int j=0;jcurrentanimation=knifeslashreversalanim; - victim->targetanimation=knifeslashreversalanim; - } - if(targetanimation!=knifeslashstartanim&&targetanimation!=staffhitanim&&targetanimation!=staffspinhitanim&&targetanimation!=winduppunchanim&&targetanimation!=wolfslapanim&&targetanimation!=swordslashanim&&targetanimation!=swordslashanim){ - victim->targettilt2=targettilt2; - victim->currentframe=currentframe; - victim->targetframe=targetframe; - victim->target=target; - victim->velocity=0; - victim->oldcoords=victim->coords; - victim->coords=coords; - victim->targetrotation=targetrotation; - victim->rotation=targetrotation; - victim->victim=this; - } - if(targetanimation==winduppunchanim){ - targetanimation=winduppunchblockedanim; - victim->targetanimation=blockhighleftanim; - victim->targetframe=1; - victim->target=.5; - victim->victim=this; - victim->targetrotation=targetrotation+180; - } - if(targetanimation==wolfslapanim){ - targetanimation=winduppunchblockedanim; - victim->targetanimation=blockhighleftanim; - victim->targetframe=1; - victim->target=.5; - victim->victim=this; - victim->targetrotation=targetrotation+180; - } - if((targetanimation==swordslashanim||targetanimation==staffhitanim||targetanimation==staffspinhitanim)&&victim->weaponactive!=-1){ - targetanimation=swordslashparriedanim; - parriedrecently=.4; - victim->parriedrecently=0; - victim->targetanimation=swordslashparryanim; - victim->targetframe=1; - victim->target=.5; - victim->victim=this; - victim->targetrotation=targetrotation+180; - - if(abs(Random()%20)==0||weapons.type[victim->weaponids[victim->weaponactive]]==knife){ - if(victim->weaponactive!=-1){ - if(weapons.type[victim->weaponids[0]]==staff||weapons.type[weaponids[0]]==staff){ - if(weapons.type[victim->weaponids[0]]==staff)weapons.damage[victim->weaponids[0]]+=.2+float(abs(Random()%100)-50)/250; - if(weapons.type[weaponids[0]]==staff)weapons.damage[weaponids[0]]+=.2+float(abs(Random()%100)-50)/250; - emit_sound_at(swordstaffsound, victim->coords); - } - else{ - emit_sound_at(metalhitsound, victim->coords); - } - } - XYZ aim; - victim->Puff(righthand); - victim->target=0; - victim->targetframe=0; - victim->targetanimation=staggerbackhighanim; - victim->targetrotation=targetrotation+180; - victim->target=0; - weapons.owner[victim->weaponids[0]]=-1; - aim=DoRotation(facing,0,90,0)*21; - aim.y+=7; - weapons.velocity[victim->weaponids[0]]=aim*-.2; - weapons.tipvelocity[victim->weaponids[0]]=aim; - weapons.missed[victim->weaponids[0]]=1; - weapons.hitsomething[victim->weaponids[0]]=0; - weapons.freetime[victim->weaponids[0]]=0; - weapons.firstfree[victim->weaponids[0]]=1; - weapons.physics[victim->weaponids[0]]=1; - victim->num_weapons--; - if(victim->num_weapons){ - victim->weaponids[0]=victim->weaponids[num_weapons]; - if(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0; - } - victim->weaponactive=-1; - for(int i=0;iweaponids[0]]==staff||weapons.type[weaponids[0]]==staff){ - if(weapons.type[victim->weaponids[0]]==staff)weapons.damage[victim->weaponids[0]]+=.2+float(abs(Random()%100)-50)/250; - if(weapons.type[weaponids[0]]==staff)weapons.damage[weaponids[0]]+=.2+float(abs(Random()%100)-50)/250; - - emit_sound_at(swordstaffsound, coords); - } - else{ - emit_sound_at(metalhitsound, coords); - } - } - - XYZ aim; - Puff(righthand); - target=0; - targetframe=0; - targetanimation=staggerbackhighanim; - targetrotation=targetrotation+180; - target=0; - weapons.owner[weaponids[0]]=-1; - aim=DoRotation(facing,0,90,0)*21; - aim.y+=7; - weapons.velocity[weaponids[0]]=aim*-.2; - weapons.tipvelocity[weaponids[0]]=aim; - weapons.hitsomething[weaponids[0]]=0; - weapons.missed[weaponids[0]]=1; - weapons.freetime[weaponids[0]]=0; - weapons.firstfree[weaponids[0]]=1; - weapons.physics[weaponids[0]]=1; - num_weapons--; - if(num_weapons){ - weaponids[0]=weaponids[num_weapons]; - if(weaponstuck==num_weapons)weaponstuck=0; - } - weaponactive=-1; - for(int i=0;icoords)>.2){ - //victim->targetanimation=sweepanim; - victim->targetanimation=dodgebackanim; - victim->targetframe=0; - victim->target=0; - //victim->velocity=0; - - XYZ rotatetarget; - rotatetarget=coords-victim->coords; - Normalise(&rotatetarget); - victim->targetrotation=-asin(0-rotatetarget.x); - victim->targetrotation*=360/6.28; - if(rotatetarget.z<0)victim->targetrotation=180-victim->targetrotation; - - victim->targettilt2=-asin(rotatetarget.y)*360/6.28;//*-70; - - victim->lastattack3=victim->lastattack2; - victim->lastattack2=victim->lastattack; - victim->lastattack=victim->targetanimation; - } - else - { - victim->targetanimation=sweepanim; - victim->targetframe=0; - victim->target=0; - - XYZ rotatetarget; - rotatetarget=coords-victim->coords; - Normalise(&rotatetarget); - victim->targetrotation=-asin(0-rotatetarget.x); - victim->targetrotation*=360/6.28; - if(rotatetarget.z<0)victim->targetrotation=180-victim->targetrotation; - - victim->targettilt2=-asin(rotatetarget.y)*360/6.28;//*-70; - - victim->lastattack3=victim->lastattack2; - victim->lastattack2=victim->lastattack; - victim->lastattack=victim->targetanimation; - } - } + else{ + emit_sound_at(metalhitsound, victim->coords); + } + } + XYZ aim; + victim->Puff(righthand); + victim->target=0; + victim->targetframe=0; + victim->targetanimation=staggerbackhighanim; + victim->targetrotation=targetrotation+180; + victim->target=0; + weapons.owner[victim->weaponids[0]]=-1; + aim=DoRotation(facing,0,90,0)*21; + aim.y+=7; + weapons.velocity[victim->weaponids[0]]=aim*-.2; + weapons.tipvelocity[victim->weaponids[0]]=aim; + weapons.missed[victim->weaponids[0]]=1; + weapons.hitsomething[victim->weaponids[0]]=0; + weapons.freetime[victim->weaponids[0]]=0; + weapons.firstfree[victim->weaponids[0]]=1; + weapons.physics[victim->weaponids[0]]=1; + victim->num_weapons--; + if(victim->num_weapons){ + victim->weaponids[0]=victim->weaponids[num_weapons]; + if(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0; + } + victim->weaponactive=-1; + for(int i=0;iweaponids[0]]==staff||weapons.type[weaponids[0]]==staff){ + if(weapons.type[victim->weaponids[0]]==staff)weapons.damage[victim->weaponids[0]]+=.2+float(abs(Random()%100)-50)/250; + if(weapons.type[weaponids[0]]==staff)weapons.damage[weaponids[0]]+=.2+float(abs(Random()%100)-50)/250; + + emit_sound_at(swordstaffsound, coords); + } + else{ + emit_sound_at(metalhitsound, coords); + } + } + + XYZ aim; + Puff(righthand); + target=0; + targetframe=0; + targetanimation=staggerbackhighanim; + targetrotation=targetrotation+180; + target=0; + weapons.owner[weaponids[0]]=-1; + aim=DoRotation(facing,0,90,0)*21; + aim.y+=7; + weapons.velocity[weaponids[0]]=aim*-.2; + weapons.tipvelocity[weaponids[0]]=aim; + weapons.hitsomething[weaponids[0]]=0; + weapons.missed[weaponids[0]]=1; + weapons.freetime[weaponids[0]]=0; + weapons.firstfree[weaponids[0]]=1; + weapons.physics[weaponids[0]]=1; + num_weapons--; + if(num_weapons){ + weaponids[0]=weaponids[num_weapons]; + if(weaponstuck==num_weapons)weaponstuck=0; + } + weaponactive=-1; + for(int i=0;icoords)>.2){ + victim->targetanimation=dodgebackanim; + victim->targetframe=0; + victim->target=0; + + XYZ rotatetarget; + rotatetarget=coords-victim->coords; + Normalise(&rotatetarget); + victim->targetrotation=-asin(0-rotatetarget.x); + victim->targetrotation*=360/6.28; + if(rotatetarget.z<0)victim->targetrotation=180-victim->targetrotation; + + victim->targettilt2=-asin(rotatetarget.y)*360/6.28;//*-70; + + victim->lastattack3=victim->lastattack2; + victim->lastattack2=victim->lastattack; + victim->lastattack=victim->targetanimation; + } + else + { + victim->targetanimation=sweepanim; + victim->targetframe=0; + victim->target=0; + + XYZ rotatetarget; + rotatetarget=coords-victim->coords; + Normalise(&rotatetarget); + victim->targetrotation=-asin(0-rotatetarget.x); + victim->targetrotation*=360/6.28; + if(rotatetarget.z<0)victim->targetrotation=180-victim->targetrotation; + + victim->targettilt2=-asin(rotatetarget.y)*360/6.28;//*-70; + + victim->lastattack3=victim->lastattack2; + victim->lastattack2=victim->lastattack; + victim->lastattack=victim->targetanimation; + } + } - velocity=0; - victim->velocity=0; + velocity=0; + victim->velocity=0; - if(aitype!=playercontrolled)feint=0; - if(aitype!=playercontrolled&&Random()%3==0&&escapednum<2&&difficulty==2)feint=1; - if(aitype!=playercontrolled&&Random()%5==0&&escapednum<2&&difficulty==1)feint=1; - if(aitype!=playercontrolled&&Random()%10==0&&escapednum<2&&difficulty==0)feint=1; + if(aitype!=playercontrolled)feint=0; + if(aitype!=playercontrolled&&Random()%3==0&&escapednum<2&&difficulty==2)feint=1; + if(aitype!=playercontrolled&&Random()%5==0&&escapednum<2&&difficulty==1)feint=1; + if(aitype!=playercontrolled&&Random()%10==0&&escapednum<2&&difficulty==0)feint=1; - if(victim->id==0&&animation[victim->targetanimation].attack==reversal)numreversals++; - } + if(victim->id==0&&animation[victim->targetanimation].attack==reversal)numreversals++; } void Person::DoDamage(float howmuch){ @@ -1408,8 +1323,8 @@ void Person::RagDoll(bool checkcollision){ skeleton.joints[j].position-=average; } - whichpatchx=coords.x/(terrain.size/subdivision*terrain.scale*terraindetail); - whichpatchz=coords.z/(terrain.size/subdivision*terrain.scale*terraindetail); + whichpatchx=coords.x/(terrain.size/subdivision*terrain.scale); + whichpatchz=coords.z/(terrain.size/subdivision*terrain.scale); if(terrain.patchobjectnum[whichpatchx][whichpatchz]) for(l=0;l1){ glBindTexture(GL_TEXTURE_2D,skeleton.drawmodel.textureptr); - DoMipmaps(0,startx,endx,starty,endy); + DoMipmaps(); } if(!skeleton.free){ @@ -4507,14 +4407,10 @@ void Person::DoStuff(){ skeleton.free=1; emit_sound_at(breaksound, coords); - /*if(id==0||findDistancefast(&coords,&viewer)<50){ - slomo=1; - slomodelay=.2; - }*/ } if(skeleton.free==1){ - if(id==0)OPENAL_SetPaused(channels[whooshsound], true); + if(id==0)pause_sound(whooshsound); if(!dead){ //If knocked over, open hands and close mouth @@ -4577,7 +4473,7 @@ void Person::DoStuff(){ skeleton.longdead+=(2000-findLength(&average))*multiplier+multiplier; if(skeleton.longdead>2000){ if(skeleton.longdead>6000){ - if(id==0)OPENAL_SetPaused(channels[whooshsound], true); + if(id==0)pause_sound(whooshsound); skeleton.free=3; DrawSkeleton(); skeleton.free=2; @@ -4686,7 +4582,7 @@ void Person::DoStuff(){ if(findLength(&average)<10&&!dead&&skeleton.free){ skeleton.longdead+=(2000-findLength(&average))*multiplier+multiplier; if(skeleton.longdead>(damage+500)*1.5){ - if(id==0)OPENAL_SetPaused(channels[whooshsound], true); + if(id==0)pause_sound(whooshsound); skeleton.free=0; velocity=0; XYZ middle; @@ -5398,7 +5294,7 @@ void Person::DoStuff(){ onterrain=1; if(id==0){ - OPENAL_SetPaused(channels[whooshsound], true); + pause_sound(whooshsound); OPENAL_SetVolume(channels[whooshsound], 0); } @@ -5754,35 +5650,11 @@ int Person::DrawSkeleton(){ skeleton.muscles[i].lastrotate3=skeleton.muscles[i].rotate3; glRotatef(-skeleton.muscles[i].lastrotate3,0,1,0); - /* - if(!isnormal(proportionbody.x)||!isnormal(proportionbody.y)||!isnormal(proportionbody.z)){ - proportionbody=1; - proportionweird=1; - } - if(!isnormal(proportionarms.x)||!isnormal(proportionarms.y)||!isnormal(proportionarms.z)){ - proportionarms=1; - proportionweird=1; - } - if(!isnormal(proportionhead.x)||!isnormal(proportionhead.y)||!isnormal(proportionhead.z)){ - proportionhead=1; - proportionweird=1; - } - if(!isnormal(proportionlegs.x)||!isnormal(proportionlegs.y)||!isnormal(proportionlegs.z)){ - proportionlegs=1; - proportionweird=1; - }*/ if(playerdetail||skeleton.free==3) { for(j=0;j=0){*/ glMatrixMode(GL_MODELVIEW); // Select The Modelview Matrix glPushMatrix(); if(skeleton.muscles[i].parent1->label==abdomen||skeleton.muscles[i].parent2->label==abdomen) @@ -6077,13 +5949,6 @@ int Person::DrawSkeleton(){ CrossProduct(&vec1,&vec2,&tempnormthing); Normalise(&tempnormthing); if(targetanimation!=staffhitanim&¤tanimation!=staffhitanim&&targetanimation!=staffgroundsmashanim&¤tanimation!=staffgroundsmashanim&&targetanimation!=staffspinhitanim&¤tanimation!=staffspinhitanim)weaponpoint+=tempnormthing*.1-skeleton.specialforward[1]*.3+(skeleton.joints[skeleton.jointlabels[rightwrist]].position-skeleton.joints[skeleton.jointlabels[rightelbow]].position); - /*if(targetanimation==staffhitanim||currentanimation==staffhitanim){ - XYZ weaptargnorm; - weaptargnorm=DoRotation(weapons.tippoint[i]-weapons.position[i],0,-rotation,0); - //weaptargnorm=animation[currentanimation].weapontarget[currentframe]*(1-target)+animation[targetanimation].weapontarget[targetframe]*(target); - Normalise(&weaptargnorm); - weaponpoint-=weaptargnorm*2; - }*/ } } if(weaponactive!=k&&weaponstuck!=k){ @@ -6318,7 +6183,7 @@ int Person::SphereCheck(XYZ *p1,float radius, XYZ *p, XYZ *move, float *rotate, onterrain=1; if(id==0){ - OPENAL_SetPaused(channels[whooshsound], true); + pause_sound(whooshsound); OPENAL_SetVolume(channels[whooshsound], 0); } @@ -6379,281 +6244,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() -{ -} -