extern bool autoslomo;
extern float camerashake;
extern float woozy;
-extern float terraindetail;
extern float viewdistance;
extern float blackout;
extern int difficulty;
extern bool gamestarted;
+Person player[maxplayers];
+
void Person::CheckKick()
{
if (!(hasvictim
velocity=0;
victim->oldcoords=victim->coords;
coords=victim->coords;
- victim->targetrotation=targetrotation;
+ victim->targetyaw=targetyaw;
victim->victim=this;
}
}
howmany=abs(Random()%(skeleton.num_joints));
if(!skeleton.free)flatvelocity=velocity;
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=DoRotation(DoRotation(DoRotation(skeleton.joints[howmany].position,0,0,tilt),tilt2,0,0),0,yaw,0)*scale+coords;
if(skeleton.free)flatfacing=skeleton.joints[howmany].position*scale+coords;
Sprite::MakeSprite(flamesprite, flatfacing,flatvelocity, 1,1,1, 2, 1);
}
if(creature==wolftype)return wolfidle;
}
if(aitype==playercontrolled&&stunned<=0&&weaponactive!=-1){
- if(weapons.type[weaponids[weaponactive]]==knife)return knifefightidleanim;
- if(weapons.type[weaponids[weaponactive]]==sword&&victim->weaponactive!=-1)return swordfightidlebothanim;
- if(weapons.type[weaponids[weaponactive]]==sword)return swordfightidleanim;
- if(weapons.type[weaponids[weaponactive]]==staff)return swordfightidleanim;
+ if(weapons[weaponids[weaponactive]].getType()==knife)
+ return knifefightidleanim;
+ if(weapons[weaponids[weaponactive]].getType()==sword&&victim->weaponactive!=-1)
+ return swordfightidlebothanim;
+ if(weapons[weaponids[weaponactive]].getType()==sword)
+ return swordfightidleanim;
+ if(weapons[weaponids[weaponactive]].getType()==staff)
+ return swordfightidleanim;
}
if(aitype!=playercontrolled&&stunned<=0&&creature!=wolftype&&!pause)return fightsidestep;
}
bloodvel=0;
if(!skeleton.free){
bloodvel.z=10;
- bloodvel=DoRotation(bloodvel,((float)(Random()%100))/4,rotation+((float)(Random()%100))/4,0)*scale;
+ bloodvel=DoRotation(bloodvel,((float)(Random()%100))/4,yaw+((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(skeleton.joints[skeleton.jointlabels[head]].velocity,((float)(Random()%100))/4,yaw+((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){
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){
- 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);
+ Sprite::MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,yaw,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,yaw,0)*scale+coords,bloodvel, 1,1,1, .3, 1);
}
}
if(Random()%2==0)
bloodvel=0;
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;
+ bloodvel+=DoRotation(skeleton.joints[skeleton.jointlabels[head]].velocity,((float)(Random()%100))/4,yaw+((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(bloodvel,((float)(Random()%100))/4,yaw+((float)(Random()%100))/4,0)*scale;
bloodvel+=DoRotation(velocity,((float)(Random()%100))/4,((float)(Random()%100))/4,0)*scale;
}
bloodvel*=.2;
if(skeleton.free){
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::MakeSprite(splintersprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,yaw,0)*scale+coords,bloodvel, 1,1,1, .05, 1);
}
Sprite::setLastSpriteSpecial(3);
}
bleeding=howmuch+(float)abs(Random()%100)/200-.25;
bleedxint=0;
bleedyint=0;
- int texdetailint=realtexdetail;
if(creature==rabbittype)
while(bloodText[bleedxint*512*3+bleedyint*3+0]>which+4||bloodText[bleedxint*512*3+bleedyint*3+0]<which-4||bleedxint<10||bleedyint<10||bleedxint>500||bleedyint>500){
bleedxint=abs(Random()%512);
bloodvel=0;
if(!skeleton.free){
bloodvel.z=10;
- bloodvel=DoRotation(bloodvel,((float)(Random()%100))/4,rotation+((float)(Random()%100))/4,0)*scale;
+ bloodvel=DoRotation(bloodvel,((float)(Random()%100))/4,yaw+((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(skeleton.joints[skeleton.jointlabels[head]].velocity,((float)(Random()%100))/4,yaw+((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){
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){
- 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);
+ Sprite::MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,yaw,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,yaw,0)*scale+coords,bloodvel, 1,1,1, .3, 1);
}
}
}
offsetx=Random()%20;
}
if(which==220||which==215){
- //offsety=Random()%20;
offsetx=20;
- //offsetx=abs(Random()%80);
}
}
}
}
- glBindTexture(GL_TEXTURE_2D,skeleton.drawmodel.textureptr);
+ skeleton.drawmodel.textureptr.bind();
DoMipmaps();
bleedxint=0;
}
bool Person::DoBloodBigWhere(float howmuch,int which, XYZ where){
- static int bleedxint,bleedyint,i,j;
+ static int i,j;
static XYZ bloodvel;
static XYZ startpoint,endpoint,colpoint,movepoint;
static float rotationpoint;
if(bloodtoggle&&decals&&tutoriallevel!=1){
where-=coords;
- if(!skeleton.free)where=DoRotation(where,0,-rotation,0);
+ if(!skeleton.free)where=DoRotation(where,0,-yaw,0);
//where=scale;
startpoint=where;
startpoint.y+=100;
bloodvel=0;
if(!skeleton.free){
bloodvel.z=10;
- bloodvel=DoRotation(bloodvel,((float)(Random()%100))/4,rotation+((float)(Random()%100))/4,0)*scale;
+ bloodvel=DoRotation(bloodvel,((float)(Random()%100))/4,yaw+((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(skeleton.joints[skeleton.jointlabels[head]].velocity,((float)(Random()%100))/4,yaw+((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){
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){
- 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);
+ Sprite::MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,yaw,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,yaw,0)*scale+coords,bloodvel, 1,1,1, .3, 1);
}
}
}
}
}
}
- glBindTexture(GL_TEXTURE_2D,skeleton.drawmodel.textureptr);
+ skeleton.drawmodel.textureptr.bind();
DoMipmaps();
bleedy=(1+coordsy)*512;
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;
+ weapons[victim->weaponids[0]].owner=-1;
+ weapons[victim->weaponids[0]].velocity=victim->velocity*.2;
+ if(weapons[victim->weaponids[0]].velocity.x==0)weapons[victim->weaponids[0]].velocity.x=.1;
+ weapons[victim->weaponids[0]].tipvelocity=weapons[victim->weaponids[0]].velocity;
+ weapons[victim->weaponids[0]].missed=1;
+ weapons[victim->weaponids[0]].freetime=0;
+ weapons[victim->weaponids[0]].firstfree=1;
+ weapons[victim->weaponids[0]].physics=1;
victim->num_weapons--;
if(victim->num_weapons){
victim->weaponids[0]=victim->weaponids[victim->num_weapons];
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;
+ weapons[victim->weaponids[0]].owner=-1;
+ weapons[victim->weaponids[0]].velocity=victim->velocity*.2;
+ if(weapons[victim->weaponids[0]].velocity.x==0)weapons[victim->weaponids[0]].velocity.x=.1;
+ weapons[victim->weaponids[0]].tipvelocity=weapons[victim->weaponids[0]].velocity;
+ weapons[victim->weaponids[0]].missed=1;
+ weapons[victim->weaponids[0]].freetime=0;
+ weapons[victim->weaponids[0]].firstfree=1;
+ weapons[victim->weaponids[0]].physics=1;
victim->num_weapons--;
if(victim->num_weapons){
victim->weaponids[0]=victim->weaponids[victim->num_weapons];
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;
+ weapons[victim->weaponids[0]].owner=-1;
+ weapons[victim->weaponids[0]].velocity=victim->velocity*.2;
+ if(weapons[victim->weaponids[0]].velocity.x==0)weapons[victim->weaponids[0]].velocity.x=.1;
+ weapons[victim->weaponids[0]].tipvelocity=weapons[victim->weaponids[0]].velocity;
+ weapons[victim->weaponids[0]].missed=1;
+ weapons[victim->weaponids[0]].freetime=0;
+ weapons[victim->weaponids[0]].firstfree=1;
+ weapons[victim->weaponids[0]].physics=1;
victim->num_weapons--;
if(victim->num_weapons){
victim->weaponids[0]=victim->weaponids[victim->num_weapons];
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;
+ weapons[victim->weaponids[0]].owner=-1;
+ weapons[victim->weaponids[0]].velocity=victim->velocity*.2;
+ if(weapons[victim->weaponids[0]].velocity.x==0)weapons[victim->weaponids[0]].velocity.x=.1;
+ weapons[victim->weaponids[0]].tipvelocity=weapons[victim->weaponids[0]].velocity;
+ weapons[victim->weaponids[0]].missed=1;
+ weapons[victim->weaponids[0]].freetime=0;
+ weapons[victim->weaponids[0]].firstfree=1;
+ weapons[victim->weaponids[0]].physics=1;
victim->num_weapons--;
if(victim->num_weapons){
victim->weaponids[0]=victim->weaponids[victim->num_weapons];
victim->velocity=0;
victim->oldcoords=victim->coords;
victim->coords=coords;
- victim->targetrotation=targetrotation;
- victim->rotation=targetrotation;
+ victim->targetyaw=targetyaw;
+ victim->yaw=targetyaw;
victim->victim=this;
}
if(targetanimation==winduppunchanim){
victim->targetframe=1;
victim->target=.5;
victim->victim=this;
- victim->targetrotation=targetrotation+180;
+ victim->targetyaw=targetyaw+180;
}
if(targetanimation==wolfslapanim){
targetanimation=winduppunchblockedanim;
victim->targetframe=1;
victim->target=.5;
victim->victim=this;
- victim->targetrotation=targetrotation+180;
+ victim->targetyaw=targetyaw+180;
}
if((targetanimation==swordslashanim||targetanimation==staffhitanim||targetanimation==staffspinhitanim)&&victim->weaponactive!=-1){
targetanimation=swordslashparriedanim;
victim->targetframe=1;
victim->target=.5;
victim->victim=this;
- victim->targetrotation=targetrotation+180;
+ victim->targetyaw=targetyaw+180;
- if(abs(Random()%20)==0||weapons.type[victim->weaponids[victim->weaponactive]]==knife){
+ if(abs(Random()%20)==0||weapons[victim->weaponids[victim->weaponactive]].getType()==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);
- }
+ if(weapons[victim->weaponids[0]].getType()==staff||weapons[weaponids[0]].getType()==staff) {
+ if(weapons[victim->weaponids[0]].getType()==staff)
+ weapons[victim->weaponids[0]].damage+=.2+float(abs(Random()%100)-50)/250;
+ if(weapons[weaponids[0]].getType()==staff)
+ weapons[weaponids[0]].damage+=.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->targetyaw=targetyaw+180;
victim->target=0;
- weapons.owner[victim->weaponids[0]]=-1;
+ weapons[victim->weaponids[0]].owner=-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;
+ weapons[victim->weaponids[0]].velocity=aim*-.2;
+ weapons[victim->weaponids[0]].tipvelocity=aim;
+ weapons[victim->weaponids[0]].missed=1;
+ weapons[victim->weaponids[0]].hitsomething=0;
+ weapons[victim->weaponids[0]].freetime=0;
+ weapons[victim->weaponids[0]].firstfree=1;
+ weapons[victim->weaponids[0]].physics=1;
victim->num_weapons--;
if(victim->num_weapons){
victim->weaponids[0]=victim->weaponids[num_weapons];
if(abs(Random()%20)==0){
if(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;
+ if(weapons[victim->weaponids[0]].getType()==staff||weapons[weaponids[0]].getType()==staff){
+ if(weapons[victim->weaponids[0]].getType()==staff)weapons[victim->weaponids[0]].damage+=.2+float(abs(Random()%100)-50)/250;
+ if(weapons[weaponids[0]].getType()==staff)weapons[weaponids[0]].damage+=.2+float(abs(Random()%100)-50)/250;
emit_sound_at(swordstaffsound, coords);
}
target=0;
targetframe=0;
targetanimation=staggerbackhighanim;
- targetrotation=targetrotation+180;
+ targetyaw=targetyaw+180;
target=0;
- weapons.owner[weaponids[0]]=-1;
+ weapons[weaponids[0]].owner=-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;
+ weapons[weaponids[0]].velocity=aim*-.2;
+ weapons[weaponids[0]].tipvelocity=aim;
+ weapons[weaponids[0]].hitsomething=0;
+ weapons[weaponids[0]].missed=1;
+ weapons[weaponids[0]].freetime=0;
+ weapons[weaponids[0]].firstfree=1;
+ weapons[weaponids[0]].physics=1;
num_weapons--;
if(num_weapons){
weaponids[0]=weaponids[num_weapons];
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->targetyaw=-asin(0-rotatetarget.x);
+ victim->targetyaw*=360/6.28;
+ if(rotatetarget.z<0)victim->targetyaw=180-victim->targetyaw;
victim->targettilt2=-asin(rotatetarget.y)*360/6.28;//*-70;
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->targetyaw=-asin(0-rotatetarget.x);
+ victim->targetyaw*=360/6.28;
+ if(rotatetarget.z<0)victim->targetyaw=180-victim->targetyaw;
victim->targettilt2=-asin(rotatetarget.y)*360/6.28;//*-70;
for(int i=0;i<skeleton.num_joints; i++){
if(!skeleton.free)flatvelocity2=velocity;
if(skeleton.free)flatvelocity2=skeleton.joints[i].velocity;
- if(!skeleton.free)flatfacing2=DoRotation(DoRotation(DoRotation(skeleton.joints[i].position,0,0,tilt),tilt2,0,0),0,rotation,0)*scale+coords;
+ if(!skeleton.free)flatfacing2=DoRotation(DoRotation(DoRotation(skeleton.joints[i].position,0,0,tilt),tilt2,0,0),0,yaw,0)*scale+coords;
if(skeleton.free)flatfacing2=skeleton.joints[i].position*scale+coords;
flatvelocity2.x+=(float)(abs(Random()%100)-50)/10;
flatvelocity2.y+=(float)(abs(Random()%100)-50)/10;
if(!freeze&&!winfreeze){
//head facing
- targetheadrotation=(float)((int)((0-rotation-targetheadrotation+180)*100)%36000)/100;
- targetheadrotation2=(float)((int)(targetheadrotation2*100)%36000)/100;
+ targetheadyaw=(float)((int)((0-yaw-targetheadyaw+180)*100)%36000)/100;
+ targetheadpitch=(float)((int)(targetheadpitch*100)%36000)/100;
- while(targetheadrotation>180)targetheadrotation-=360;
- while(targetheadrotation<-180)targetheadrotation+=360;
+ while(targetheadyaw>180)targetheadyaw-=360;
+ while(targetheadyaw<-180)targetheadyaw+=360;
- if(targetheadrotation>160)targetheadrotation2=targetheadrotation2*-1;
- if(targetheadrotation<-160)targetheadrotation2=targetheadrotation2*-1;
- if(targetheadrotation>160)targetheadrotation=targetheadrotation-180;
- if(targetheadrotation<-160)targetheadrotation=targetheadrotation+180;
+ if(targetheadyaw>160)targetheadpitch=targetheadpitch*-1;
+ if(targetheadyaw<-160)targetheadpitch=targetheadpitch*-1;
+ if(targetheadyaw>160)targetheadyaw=targetheadyaw-180;
+ if(targetheadyaw<-160)targetheadyaw=targetheadyaw+180;
- if(targetheadrotation2>120)targetheadrotation2=120;
- if(targetheadrotation2<-120)targetheadrotation2=-120;
- if(targetheadrotation>120)targetheadrotation=120;
- if(targetheadrotation<-120)targetheadrotation=-120;
+ if(targetheadpitch>120)targetheadpitch=120;
+ if(targetheadpitch<-120)targetheadpitch=-120;
+ if(targetheadyaw>120)targetheadyaw=120;
+ if(targetheadyaw<-120)targetheadyaw=-120;
- if(!isIdle())targetheadrotation2=0;
+ if(!isIdle())targetheadpitch=0;
if(isIdle()){
- if(targetheadrotation>80)targetheadrotation=80;
- if(targetheadrotation<-80)targetheadrotation=-80;
- if(targetheadrotation2>50)targetheadrotation2=50;
- if(targetheadrotation2<-50)targetheadrotation2=-50;
+ if(targetheadyaw>80)targetheadyaw=80;
+ if(targetheadyaw<-80)targetheadyaw=-80;
+ if(targetheadpitch>50)targetheadpitch=50;
+ if(targetheadpitch<-50)targetheadpitch=-50;
}
- if(abs(headrotation-targetheadrotation)<multiplier*lookspeed)headrotation=targetheadrotation;
- else if(headrotation>targetheadrotation){
- headrotation-=multiplier*lookspeed;
+ if(abs(headyaw-targetheadyaw)<multiplier*lookspeed)headyaw=targetheadyaw;
+ else if(headyaw>targetheadyaw){
+ headyaw-=multiplier*lookspeed;
}
- else if(headrotation<targetheadrotation){
- headrotation+=multiplier*lookspeed;
+ else if(headyaw<targetheadyaw){
+ headyaw+=multiplier*lookspeed;
}
- if(abs(headrotation2-targetheadrotation2)<multiplier*lookspeed/2)headrotation2=targetheadrotation2;
- else if(headrotation2>targetheadrotation2){
- headrotation2-=multiplier*lookspeed/2;
+ if(abs(headpitch-targetheadpitch)<multiplier*lookspeed/2)headpitch=targetheadpitch;
+ else if(headpitch>targetheadpitch){
+ headpitch-=multiplier*lookspeed/2;
}
- else if(headrotation2<targetheadrotation2){
- headrotation2+=multiplier*lookspeed/2;
+ else if(headpitch<targetheadpitch){
+ headpitch+=multiplier*lookspeed/2;
}
rotatearound=skeleton.joints[skeleton.jointlabels[neck]].position;
- skeleton.joints[skeleton.jointlabels[head]].position=rotatearound+DoRotation(skeleton.joints[skeleton.jointlabels[head]].position-rotatearound,headrotation2,0,0);
+ skeleton.joints[skeleton.jointlabels[head]].position=rotatearound+DoRotation(skeleton.joints[skeleton.jointlabels[head]].position-rotatearound,headpitch,0,0);
facing=0;
facing.z=-1;
if(targetanimation!=bounceidleanim&&targetanimation!=fightidleanim&&targetanimation!=wolfidle&&targetanimation!=knifefightidleanim&&targetanimation!=drawrightanim&&targetanimation!=drawleftanim&&targetanimation!=walkanim){
- facing=DoRotation(facing,headrotation2*.4,0,0);
- facing=DoRotation(facing,0,headrotation*.4,0);
+ facing=DoRotation(facing,headpitch*.4,0,0);
+ facing=DoRotation(facing,0,headyaw*.4,0);
}
if(targetanimation==bounceidleanim||targetanimation==fightidleanim||targetanimation==wolfidle||targetanimation==knifefightidleanim||targetanimation==drawrightanim||targetanimation==drawleftanim){
- facing=DoRotation(facing,headrotation2*.8,0,0);
- facing=DoRotation(facing,0,headrotation*.8,0);
+ facing=DoRotation(facing,headpitch*.8,0,0);
+ facing=DoRotation(facing,0,headyaw*.8,0);
}
if(targetanimation==walkanim){
- facing=DoRotation(facing,headrotation2*.6,0,0);
- facing=DoRotation(facing,0,headrotation*.6,0);
+ facing=DoRotation(facing,headpitch*.6,0,0);
+ facing=DoRotation(facing,0,headyaw*.6,0);
}
skeleton.specialforward[0]=facing;
- //skeleton.specialforward[0]=DoRotation(facing,0,rotation,0);
+ //skeleton.specialforward[0]=DoRotation(facing,0,yaw,0);
static int i;
for(i=0;i<skeleton.num_muscles;i++){
if(skeleton.muscles[i].visible&&(skeleton.muscles[i].parent1->label==head||skeleton.muscles[i].parent2->label==head))
facing=0;
facing.z=1;
- facing=DoRotation(facing,0,rotation,0);
+ facing=DoRotation(facing,0,yaw,0);
skeleton.freetime=0;
if(!isnormal(velocity.x))velocity.x=0;
if(!isnormal(velocity.y))velocity.y=0;
if(!isnormal(velocity.z))velocity.z=0;
- if(!isnormal(rotation))rotation=0;
+ if(!isnormal(yaw))yaw=0;
if(!isnormal(coords.x))coords=0;
if(!isnormal(tilt))tilt=0;
if(!isnormal(tilt2))tilt2=0;
for(i=0;i<skeleton.num_joints;i++){
skeleton.joints[i].delay=0;
skeleton.joints[i].locked=0;
- skeleton.joints[i].position=DoRotation(DoRotation(DoRotation(skeleton.joints[i].position,0,0,tilt),tilt2,0,0),0,rotation,0);
- if(!isnormal(skeleton.joints[i].position.x))skeleton.joints[i].position=DoRotation(skeleton.joints[i].position,0,rotation,0);
+ skeleton.joints[i].position=DoRotation(DoRotation(DoRotation(skeleton.joints[i].position,0,0,tilt),tilt2,0,0),0,yaw,0);
+ if(!isnormal(skeleton.joints[i].position.x))skeleton.joints[i].position=DoRotation(skeleton.joints[i].position,0,yaw,0);
if(!isnormal(skeleton.joints[i].position.x))skeleton.joints[i].position=skeleton.joints[i].position;
if(!isnormal(skeleton.joints[i].position.x))skeleton.joints[i].position=coords;
skeleton.joints[i].position.y+=.1;
speed*=speedmult;
for(i=0;i<skeleton.num_joints;i++){
- if((animation[currentanimation].attack!=reversed||currentanimation==swordslashreversedanim)&¤tanimation!=rabbitkickanim&&!isLanding()&&!wasLanding()&&animation[currentanimation].height==animation[targetanimation].height)skeleton.joints[i].velocity=velocity/scale+facing*5+DoRotation(DoRotation(DoRotation((animation[targetanimation].position[i][targetframe]-animation[currentanimation].position[i][currentframe])*speed,0,0,tilt),tilt2,0,0),0,rotation,0);
+ if((animation[currentanimation].attack!=reversed||currentanimation==swordslashreversedanim)&¤tanimation!=rabbitkickanim&&!isLanding()&&!wasLanding()&&animation[currentanimation].height==animation[targetanimation].height)skeleton.joints[i].velocity=velocity/scale+facing*5+DoRotation(DoRotation(DoRotation((animation[targetanimation].position[i][targetframe]-animation[currentanimation].position[i][currentframe])*speed,0,0,tilt),tilt2,0,0),0,yaw,0);
else skeleton.joints[i].velocity=velocity/scale+facing*5;
change.x=(float)(Random()%100)/100;
change.y=(float)(Random()%100)/100;
skeleton.joints[j].position-=average;
}
- whichpatchx=coords.x/(terrain.size/subdivision*terrain.scale*terraindetail);
- whichpatchz=coords.z/(terrain.size/subdivision*terrain.scale*terraindetail);
+ whichpatchx=coords.x/(terrain.size/subdivision*terrain.scale);
+ whichpatchz=coords.z/(terrain.size/subdivision*terrain.scale);
if(terrain.patchobjectnum[whichpatchx][whichpatchz])
for(l=0;l<terrain.patchobjectnum[whichpatchx][whichpatchz];l++){
i=terrain.patchobjects[whichpatchx][whichpatchz][l];
lowpoint=coords;
lowpoint.y+=1;
- if(SphereCheck(&lowpoint, 3, &colpoint, &objects.position[i], &objects.rotation[i], &objects.model[i])!=-1){
+ if(SphereCheck(&lowpoint, 3, &colpoint, &objects.position[i], &objects.yaw[i], &objects.model[i])!=-1){
coords.x=lowpoint.x;
coords.z=lowpoint.z;
}
}
}
- rotation=0;
+ yaw=0;
updatedelay=0;
velocity=0;
if(Random()%2==0){
if(weaponactive!=-1&&targetanimation!=rabbitkickanim&&num_weapons>0){
- weapons.owner[weaponids[0]]=-1;
- weapons.hitsomething[weaponids[0]]=0;
- weapons.velocity[weaponids[0]]=skeleton.joints[skeleton.jointlabels[righthand]].velocity*scale*-.3;
- weapons.velocity[weaponids[0]].x+=.01;
- weapons.tipvelocity[weaponids[0]]=skeleton.joints[skeleton.jointlabels[righthand]].velocity*scale;
- weapons.missed[weaponids[0]]=1;
- weapons.freetime[weaponids[0]]=0;
- weapons.firstfree[weaponids[0]]=1;
- weapons.physics[weaponids[0]]=1;
+ weapons[weaponids[0]].owner=-1;
+ weapons[weaponids[0]].hitsomething=0;
+ weapons[weaponids[0]].velocity=skeleton.joints[skeleton.jointlabels[righthand]].velocity*scale*-.3;
+ weapons[weaponids[0]].velocity.x+=.01;
+ weapons[weaponids[0]].tipvelocity=skeleton.joints[skeleton.jointlabels[righthand]].velocity*scale;
+ weapons[weaponids[0]].missed=1;
+ weapons[weaponids[0]].freetime=0;
+ weapons[weaponids[0]].firstfree=1;
+ weapons[weaponids[0]].physics=1;
num_weapons--;
if(num_weapons){
weaponids[0]=weaponids[num_weapons];
if(opacity>1)
{
footvel=0;
- 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;
+ if(which==0)footpoint=DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,yaw,0)*scale+coords;
+ if(which==1)footpoint=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,yaw,0)*scale+coords;
//footpoint.y=coords.y;
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;
if(footvel.y<.8)footvel.y=.8;
- 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;
+ if(which==0)footpoint=DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,yaw,0)*scale+coords;
+ if(which==1)footpoint=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,yaw,0)*scale+coords;
footpoint.y=terrain.getHeight(footpoint.x,footpoint.z);
terrainlight=terrain.getLighting(footpoint.x,footpoint.z);
if(findDistancefast(&footpoint,&viewer)<viewdistance*viewdistance/4)Sprite::MakeSprite(cloudsprite, footpoint,footvel*.6, terrainlight.x,terrainlight.y,terrainlight.z, .5, .7*opacity);
- if(opacity>=1||detail==2)if(detail==2)if(findDistancefast(&footpoint,&viewer)<viewdistance*viewdistance/4)terrain.MakeDecal(footprintdecal,footpoint,.2,1*opacity,rotation);
+ if(opacity>=1||detail==2)if(detail==2)if(findDistancefast(&footpoint,&viewer)<viewdistance*viewdistance/4)terrain.MakeDecal(footprintdecal,footpoint,.2,1*opacity,yaw);
}
else if(environment==grassyenvironment&&onterrain&&terrain.getOpacity(coords.x,coords.z)<.2){
footvel=velocity/5;
if(footvel.y<.8)footvel.y=.8;
- 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;
+ if(which==0)footpoint=DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,yaw,0)*scale+coords;
+ if(which==1)footpoint=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,yaw,0)*scale+coords;
footpoint.y=terrain.getHeight(footpoint.x,footpoint.z);
terrainlight=terrain.getLighting(footpoint.x,footpoint.z);
if(findDistancefast(&footpoint,&viewer)<viewdistance*viewdistance/4)Sprite::MakeSprite(cloudsprite, footpoint,footvel*.6, terrainlight.x*90/255,terrainlight.y*70/255,terrainlight.z*8/255, .5, .5*opacity);
else if(environment==desertenvironment&&onterrain&&terrain.getOpacity(coords.x,coords.z)<.2){
footvel=velocity/5;
if(footvel.y<.8)footvel.y=.8;
- 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;
+ if(which==0)footpoint=DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,yaw,0)*scale+coords;
+ if(which==1)footpoint=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,yaw,0)*scale+coords;
footpoint.y=terrain.getHeight(footpoint.x,footpoint.z);
terrainlight=terrain.getLighting(footpoint.x,footpoint.z);
if(findDistancefast(&footpoint,&viewer)<viewdistance*viewdistance/4)Sprite::MakeSprite(cloudsprite, footpoint,footvel*.6, terrainlight.x*190/255,terrainlight.y*170/255,terrainlight.z*108/255, .5, .7*opacity);
- if(opacity>=1||detail==2)if(detail==2)if(findDistancefast(&footpoint,&viewer)<viewdistance*viewdistance/4)terrain.MakeDecal(footprintdecal,footpoint,.2,.25*opacity,rotation);
+ if(opacity>=1||detail==2)if(detail==2)if(findDistancefast(&footpoint,&viewer)<viewdistance*viewdistance/4)terrain.MakeDecal(footprintdecal,footpoint,.2,.25*opacity,yaw);
}
else if(isLanding()||targetanimation==jumpupanim||isLandhard())
{
footvel=velocity/5;
if(footvel.y<.8)footvel.y=.8;
- 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;
+ if(which==0)footpoint=DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,yaw,0)*scale+coords;
+ if(which==1)footpoint=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,yaw,0)*scale+coords;
//footpoint.y=coords.y;
if(findDistancefast(&footpoint,&viewer)<viewdistance*viewdistance/4)Sprite::MakeSprite(cloudsprite, footpoint,footvel*.6, 1,1,1, .5, .2*opacity);
}
static XYZ footvel,footpoint;
footvel=0;
- footpoint=DoRotation(skeleton.joints[skeleton.jointlabels[whichlabel]].position,0,rotation,0)*scale+coords;
+ footpoint=DoRotation(skeleton.joints[skeleton.jointlabels[whichlabel]].position,0,yaw,0)*scale+coords;
Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,1,1, .9, .3);
}
+Joint& Person::getJointFor(int bodypart) {
+ return skeleton.joints[skeleton.jointlabels[bodypart]];
+}
+
+void Person::setAnimation(int animation) {
+ targetanimation=animation;
+ targetframe=0;
+ target=0;
+}
void Person::DoAnimations(){
if(!skeleton.free){
targfacing=0;
targfacing.z=1;
- targfacing=DoRotation(targfacing,0,targetrotation,0);
+ targfacing=DoRotation(targfacing,0,targetyaw,0);
if(normaldotproduct(targfacing,velocity)>=-.3)targetanimation=flipanim;
else targetanimation=backflipanim;
else victim->targetanimation=rabbittackledfrontanim;
victim->targetframe=2;
victim->target=0;
- victim->rotation=rotation;
- victim->targetrotation=rotation;
+ victim->yaw=yaw;
+ victim->targetyaw=yaw;
if(victim->aitype==gethelptype)victim->DoDamage(victim->damagetolerance-victim->damage);
//victim->DoDamage(30);
if(creature==wolftype){
}
if(!drawtogglekeydown&&drawkeydown&&(weaponactive==-1||num_weapons==1)&&(animation[targetanimation].label[targetframe]||(targetanimation!=currentanimation&¤tanimation==rollanim))&&num_weapons>0&&creature!=wolftype){
- if(weapons.type[weaponids[0]]==knife){
+ if(weapons[weaponids[0]].getType()==knife){
if(weaponactive==-1)weaponactive=0;
else if(weaponactive==0)weaponactive=-1;
targetframe++;
if(targetanimation==removeknifeanim&&animation[targetanimation].label[currentframe]==5){
- for(i=0;i<weapons.numweapons;i++){
- if(/*weapons.velocity[i].x==0&&weapons.velocity[i].y==0&&weapons.velocity[i].z==0&&*/weapons.owner[i]==-1)
- if(findDistancefastflat(&coords,&weapons.position[i])<4&&weaponactive==-1){
- if(findDistancefast(&coords,&weapons.position[i])>=1){
- if(weapons.type[i]!=staff){
+ for(i=0;i<weapons.size();i++){
+ if(weapons[i].owner==-1)
+ if(findDistancefastflat(&coords,&weapons[i].position)<4&&weaponactive==-1){
+ if(findDistancefast(&coords,&weapons[i].position)>=1){
+ if(weapons[i].getType()!=staff){
emit_sound_at(knifedrawsound, coords, 128.);
}
weaponactive=0;
- weapons.owner[i]=id;
+ weapons[i].owner=id;
if(num_weapons>0){
weaponids[num_weapons]=weaponids[0];
}
}
}
- static bool willwork;
if(targetanimation==crouchremoveknifeanim&&animation[targetanimation].label[currentframe]==5){
- for(i=0;i<weapons.numweapons;i++){
- bool willwork=1;
- if(weapons.owner[i]!=-1)
- if(player[weapons.owner[i]].weaponstuck!=-1)
- if(player[weapons.owner[i]].weaponids[player[weapons.owner[i]].weaponstuck]==i)
- if(player[weapons.owner[i]].num_weapons>1)willwork=0;
- if((/*weapons.velocity[i].x==0&&weapons.velocity[i].y==0&&weapons.velocity[i].z==0&&*/weapons.owner[i]==-1)||(hasvictim&&weapons.owner[i]==victim->id&&victim->skeleton.free))
- if(willwork&&findDistancefastflat(&coords,&weapons.position[i])<3&&weaponactive==-1){
- if(findDistancefast(&coords,&weapons.position[i])<1||hasvictim){
- bool fleshstuck=0;
- if(weapons.owner[i]!=-1)
+ for(i=0;i<weapons.size();i++){
+ bool willwork=true;
+ if(weapons[i].owner!=-1)
+ if(player[weapons[i].owner].weaponstuck!=-1)
+ if(player[weapons[i].owner].weaponids[player[weapons[i].owner].weaponstuck]==i)
+ if(player[weapons[i].owner].num_weapons>1)willwork=0;
+ if((weapons[i].owner==-1)||(hasvictim&&weapons[i].owner==victim->id&&victim->skeleton.free))
+ if(willwork&&findDistancefastflat(&coords,&weapons[i].position)<3&&weaponactive==-1){
+ if(findDistancefast(&coords,&weapons[i].position)<1||hasvictim){
+ bool fleshstuck=false;
+ if(weapons[i].owner!=-1)
if(victim->weaponstuck!=-1){
if(victim->weaponids[victim->weaponstuck]==i){
- fleshstuck=1;
- }
- }
- if(!fleshstuck){
- if(weapons.type[i]!=staff){
- emit_sound_at(knifedrawsound, coords, 128.);
+ fleshstuck=true;
}
}
if(fleshstuck){
emit_sound_at(fleshstabremovesound, coords, 128.);
+ } else {
+ if(weapons[i].getType()!=staff){
+ emit_sound_at(knifedrawsound, coords, 128.);
+ }
}
weaponactive=0;
- if(weapons.owner[i]!=-1){
+ if(weapons[i].owner!=-1){
- victim=&player[weapons.owner[i]];
+ victim=&player[weapons[i].owner];
if(victim->num_weapons==1)victim->num_weapons=0;
else victim->num_weapons=1;
Normalise(&relative);
XYZ footvel,footpoint;
footvel=0;
- footpoint=weapons.position[i];
+ footpoint=weapons[i].position;
if(victim->weaponstuck!=-1){
if(victim->weaponids[victim->weaponstuck]==i){
if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .8, .3);
- weapons.bloody[i]=2;
- weapons.blooddrip[i]=5;
+ weapons[i].bloody=2;
+ weapons[i].blooddrip=5;
victim->weaponstuck=-1;
}
}
victim->skeleton.joints[victim->skeleton.jointlabels[rightshoulder]].velocity+=relative*6;
victim->skeleton.joints[victim->skeleton.jointlabels[leftshoulder]].velocity+=relative*6;
}
- weapons.owner[i]=id;
+ weapons[i].owner=id;
if(num_weapons>0){
weaponids[num_weapons]=weaponids[0];
}
if((currentanimation==walljumprightkickanim&&targetanimation==walljumprightkickanim)||(currentanimation==walljumpleftkickanim&&targetanimation==walljumpleftkickanim)){
- XYZ rotatetarget=DoRotation(skeleton.forward,0,rotation,0);
+ XYZ rotatetarget=DoRotation(skeleton.forward,0,yaw,0);
Normalise(&rotatetarget);
- targetrotation=-asin(0-rotatetarget.x);
- targetrotation*=360/6.28;
- if(rotatetarget.z<0)targetrotation=180-targetrotation;
+ targetyaw=-asin(0-rotatetarget.x);
+ targetyaw*=360/6.28;
+ if(rotatetarget.z<0)targetyaw=180-targetyaw;
- if(targetanimation==walljumprightkickanim)targetrotation+=40;
- if(targetanimation==walljumpleftkickanim)targetrotation-=40;
+ if(targetanimation==walljumprightkickanim)targetyaw+=40;
+ if(targetanimation==walljumpleftkickanim)targetyaw-=40;
}
bool dojumpattack;
if(coords.z!=victim->coords.z||coords.x!=victim->coords.x){
rotatetarget=coords-victim->coords;
Normalise(&rotatetarget);
- targetrotation=-asin(0-rotatetarget.x);
- targetrotation*=360/6.28;
- if(rotatetarget.z<0)targetrotation=180-targetrotation;
+ targetyaw=-asin(0-rotatetarget.x);
+ targetyaw*=360/6.28;
+ if(rotatetarget.z<0)targetyaw=180-targetyaw;
}
if(targetanimation!=rabbitrunninganim){
emit_sound_at(jumpsound, coords, 128.);
if(!victim->skeleton.free)hasvictim=0;
if(!hasvictim){
- terrain.MakeDecal(blooddecalfast,(weapons.tippoint[weaponids[weaponactive]]*.8+weapons.position[weaponids[weaponactive]]*.2),.08,.6,Random()%360);
+ terrain.MakeDecal(blooddecalfast,(weapons[weaponids[weaponactive]].tippoint*.8+weapons[weaponids[weaponactive]].position*.2),.08,.6,Random()%360);
emit_sound_at(knifesheathesound, coords, 128.);
}
XYZ where,startpoint,endpoint,movepoint,colpoint;
float rotationpoint;
int whichtri;
- if(weapons.type[weaponids[weaponactive]]==knife){
- where=(weapons.tippoint[weaponids[weaponactive]]*.6+weapons.position[weaponids[weaponactive]]*.4);
+ if(weapons[weaponids[weaponactive]].getType()==knife){
+ where=(weapons[weaponids[weaponactive]].tippoint*.6+weapons[weaponids[weaponactive]].position*.4);
where-=victim->coords;
- if(!victim->skeleton.free)where=DoRotation(where,0,-victim->rotation,0);
+ if(!victim->skeleton.free)where=DoRotation(where,0,-victim->yaw,0);
//where=scale;
startpoint=where;
startpoint.y+=100;
endpoint=where;
endpoint.y-=100;
}
- if(weapons.type[weaponids[weaponactive]]==sword){
- where=weapons.position[weaponids[weaponactive]];
+ if(weapons[weaponids[weaponactive]].getType()==sword){
+ where=weapons[weaponids[weaponactive]].position;
where-=victim->coords;
- if(!victim->skeleton.free)where=DoRotation(where,0,-victim->rotation,0);
+ if(!victim->skeleton.free)where=DoRotation(where,0,-victim->yaw,0);
startpoint=where;
- where=weapons.tippoint[weaponids[weaponactive]];
+ where=weapons[weaponids[weaponactive]].tippoint;
where-=victim->coords;
- if(!victim->skeleton.free)where=DoRotation(where,0,-victim->rotation,0);
+ if(!victim->skeleton.free)where=DoRotation(where,0,-victim->yaw,0);
endpoint=where;
}
- if(weapons.type[weaponids[weaponactive]]==staff){
- where=weapons.position[weaponids[weaponactive]];
+ if(weapons[weaponids[weaponactive]].getType()==staff){
+ where=weapons[weaponids[weaponactive]].position;
where-=victim->coords;
- if(!victim->skeleton.free)where=DoRotation(where,0,-victim->rotation,0);
+ if(!victim->skeleton.free)where=DoRotation(where,0,-victim->yaw,0);
startpoint=where;
- where=weapons.tippoint[weaponids[weaponactive]];
+ where=weapons[weaponids[weaponactive]].tippoint;
where-=victim->coords;
- if(!victim->skeleton.free)where=DoRotation(where,0,-victim->rotation,0);
+ if(!victim->skeleton.free)where=DoRotation(where,0,-victim->yaw,0);
endpoint=where;
}
movepoint=0;
if (!victim->dead)
award_bonus(id, FinishedBonus);
}
- if(bloodtoggle)weapons.bloody[weaponids[weaponactive]]=2;
+ if(bloodtoggle)weapons[weaponids[weaponactive]].bloody=2;
victim->skeleton.longdead=0;
victim->skeleton.free=1;
emit_sound_at(fleshstabsound, coords, 128);
}
- if(whichtri!=-1||weapons.bloody[weaponids[weaponactive]]){
- weapons.blooddrip[weaponids[weaponactive]]+=5;
- weapons.blooddripdelay[weaponids[weaponactive]]=0;
+ if(whichtri!=-1||weapons[weaponids[weaponactive]].bloody){
+ weapons[weaponids[weaponactive]].blooddrip+=5;
+ weapons[weaponids[weaponactive]].blooddripdelay=0;
}
if(whichtri==-1){
hasvictim=0;
emit_sound_at(fleshstabremovesound, coords, 128.);
footvel=0;
- footpoint=(weapons.tippoint[weaponids[weaponactive]]*.8+weapons.position[weaponids[weaponactive]]*.2);
+ footpoint=(weapons[weaponids[weaponactive]].tippoint*.8+weapons[weaponids[weaponactive]].position*.2);
- if(weapons.type[weaponids[weaponactive]]==sword){
+ if(weapons[weaponids[weaponactive]].getType()==sword){
XYZ where,startpoint,endpoint,movepoint;
float rotationpoint;
int whichtri;
- where=weapons.position[weaponids[weaponactive]];
+ where=weapons[weaponids[weaponactive]].position;
where-=victim->coords;
- if(!victim->skeleton.free)where=DoRotation(where,0,-victim->rotation,0);
+ if(!victim->skeleton.free)where=DoRotation(where,0,-victim->yaw,0);
startpoint=where;
- where=weapons.tippoint[weaponids[weaponactive]];
+ where=weapons[weaponids[weaponactive]].tippoint;
where-=victim->coords;
- if(!victim->skeleton.free)where=DoRotation(where,0,-victim->rotation,0);
+ if(!victim->skeleton.free)where=DoRotation(where,0,-victim->yaw,0);
endpoint=where;
movepoint=0;
footpoint+=victim->coords;
if(whichtri==-1){
- footpoint=(weapons.tippoint[weaponids[weaponactive]]*.8+weapons.position[weaponids[weaponactive]]*.2);
+ footpoint=(weapons[weaponids[weaponactive]].tippoint*.8+weapons[weaponids[weaponactive]].position*.2);
}
}
- if(weapons.type[weaponids[weaponactive]]==staff){
+ if(weapons[weaponids[weaponactive]].getType()==staff){
XYZ where,startpoint,endpoint,movepoint;
float rotationpoint;
int whichtri;
- where=weapons.position[weaponids[weaponactive]];
+ where=weapons[weaponids[weaponactive]].position;
where-=victim->coords;
- if(!victim->skeleton.free)where=DoRotation(where,0,-victim->rotation,0);
+ if(!victim->skeleton.free)where=DoRotation(where,0,-victim->yaw,0);
startpoint=where;
- where=weapons.tippoint[weaponids[weaponactive]];
+ where=weapons[weaponids[weaponactive]].tippoint;
where-=victim->coords;
- if(!victim->skeleton.free)where=DoRotation(where,0,-victim->rotation,0);
+ if(!victim->skeleton.free)where=DoRotation(where,0,-victim->yaw,0);
endpoint=where;
movepoint=0;
footpoint+=victim->coords;
if(whichtri==-1){
- footpoint=(weapons.tippoint[weaponids[weaponactive]]*.8+weapons.position[weaponids[weaponactive]]*.2);
+ footpoint=(weapons[weaponids[weaponactive]].tippoint*.8+weapons[weaponids[weaponactive]].position*.2);
}
}
hasvictim=victim->DoBloodBigWhere(2,220,footpoint);
}
}
if(!hasvictim&&onterrain){
- weapons.bloody[weaponids[weaponactive]]=0;
- weapons.blooddrip[weaponids[weaponactive]]=0;
+ weapons[weaponids[weaponactive]].bloody=0;
+ weapons[weaponids[weaponactive]].blooddrip=0;
}
}
victim->targetframe=0;
victim->targetanimation=staggerbackhardanim;
- victim->targetrotation=targetrotation+180;
+ victim->targetyaw=targetyaw+180;
victim->target=0;
victim->stunned=1;
victim->targetframe=0;
victim->targetanimation=staggerbackhardanim;
- victim->targetrotation=targetrotation+180;
+ victim->targetyaw=targetyaw+180;
victim->target=0;
victim->stunned=1;
if(victim->id==0)camerashake+=.4;
if(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;
+ if(weapons[victim->weaponids[0]].getType()==staff||weapons[weaponids[0]].getType()==staff){
+ if(weapons[victim->weaponids[0]].getType()==staff)weapons[victim->weaponids[0]].damage+=.2+float(abs(Random()%100)-50)/250;
+ if(weapons[weaponids[0]].getType()==staff)weapons[weaponids[0]].damage+=.2+float(abs(Random()%100)-50)/250;
emit_sound_at(swordstaffsound, victim->coords);
}
if(weaponactive!=-1){
escapednum=0;
XYZ aim;
- weapons.owner[weaponids[0]]=-1;
- aim=victim->coords+DoRotation(victim->skeleton.joints[victim->skeleton.jointlabels[abdomen]].position,0,victim->rotation,0)*victim->scale+victim->velocity*findDistance(&victim->coords,&coords)/50-(coords+DoRotation(skeleton.joints[skeleton.jointlabels[righthand]].position,0,rotation,0)*scale);
+ weapons[weaponids[0]].owner=-1;
+ aim=victim->coords+DoRotation(victim->skeleton.joints[victim->skeleton.jointlabels[abdomen]].position,0,victim->yaw,0)*victim->scale+victim->velocity*findDistance(&victim->coords,&coords)/50-(coords+DoRotation(skeleton.joints[skeleton.jointlabels[righthand]].position,0,yaw,0)*scale);
Normalise(&aim);
/*if(victim->targetanimation==jumpupanim||victim->targetanimation==jumpdownanim){
aim=DoRotation(aim,(float)abs(Random()%15)-7,(float)abs(Random()%15)-7,0);
}*/
- weapons.velocity[weaponids[0]]=aim*50;
- weapons.tipvelocity[weaponids[0]]=aim*50;
- weapons.missed[weaponids[0]]=0;
- weapons.hitsomething[weaponids[0]]=0;
- weapons.freetime[weaponids[0]]=0;
- weapons.firstfree[weaponids[0]]=1;
- weapons.physics[weaponids[0]]=0;
+ weapons[weaponids[0]].velocity=aim*50;
+ weapons[weaponids[0]].tipvelocity=aim*50;
+ weapons[weaponids[0]].missed=0;
+ weapons[weaponids[0]].hitsomething=0;
+ weapons[weaponids[0]].freetime=0;
+ weapons[weaponids[0]].firstfree=1;
+ weapons[weaponids[0]].physics=0;
num_weapons--;
if(num_weapons){
weaponids[0]=weaponids[num_weapons];
if(victim->id != 0 || difficulty==2){
victim->targetframe=0;
victim->targetanimation=staggerbackhardanim;
- victim->targetrotation=targetrotation+180;
+ victim->targetyaw=targetyaw+180;
victim->target=0;
}
}
victim->highreversaldelay=0;
if(aitype!=playercontrolled)weaponmissdelay=.6;
- if(tutoriallevel!=1)if(bloodtoggle&&!weapons.bloody[weaponids[weaponactive]])weapons.bloody[weaponids[weaponactive]]=1;
- if(tutoriallevel!=1)weapons.blooddrip[weaponids[weaponactive]]+=3;
+ if(tutoriallevel!=1)if(bloodtoggle&&!weapons[weaponids[weaponactive]].bloody)weapons[weaponids[weaponactive]].bloody=1;
+ if(tutoriallevel!=1)weapons[weaponids[weaponactive]].blooddrip+=3;
XYZ footvel,footpoint;
footvel=0;
footpoint=(victim->skeleton.joints[victim->skeleton.jointlabels[abdomen]].position+victim->skeleton.joints[victim->skeleton.jointlabels[neck]].position)/2*victim->scale+victim->coords;
}
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;
+ footpoint=DoRotation((victim->skeleton.joints[victim->skeleton.jointlabels[abdomen]].position+victim->skeleton.joints[victim->skeleton.jointlabels[neck]].position)/2,0,victim->yaw,0)*victim->scale+victim->coords;
}
if(tutoriallevel!=1){
if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .6, .3);
if(tutoriallevel!=1){
victim->targetframe=0;
victim->targetanimation=staggerbackhardanim;
- victim->targetrotation=targetrotation+180;
+ victim->targetyaw=targetyaw+180;
victim->target=0;
}
if(tutoriallevel!=1){
- if(bloodtoggle&&!weapons.bloody[weaponids[weaponactive]])weapons.bloody[weaponids[weaponactive]]=1;
- weapons.blooddrip[weaponids[weaponactive]]+=3;
+ if(bloodtoggle&&!weapons[weaponids[weaponactive]].bloody)weapons[weaponids[weaponactive]].bloody=1;
+ weapons[weaponids[weaponactive]].blooddrip+=3;
float bloodlossamount;
bloodlossamount=200+abs((float)(Random()%40))-20;
footpoint=(victim->skeleton.joints[victim->skeleton.jointlabels[abdomen]].position+victim->skeleton.joints[victim->skeleton.jointlabels[neck]].position)/2*victim->scale+victim->coords;
}
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;
+ footpoint=DoRotation((victim->skeleton.joints[victim->skeleton.jointlabels[abdomen]].position+victim->skeleton.joints[victim->skeleton.jointlabels[neck]].position)/2,0,victim->yaw,0)*victim->scale+victim->coords;
}
if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3);
footvel=DoRotation(facing,0,90,0)*.8;
}
else {
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;
+ if(weapons[victim->weaponids[0]].getType()==staff||weapons[weaponids[0]].getType()==staff){
+ if(weapons[victim->weaponids[0]].getType()==staff)weapons[victim->weaponids[0]].damage+=.2+float(abs(Random()%100)-50)/250;
+ if(weapons[weaponids[0]].getType()==staff)weapons[weaponids[0]].damage+=.2+float(abs(Random()%100)-50)/250;
emit_sound_at(swordstaffsound, victim->coords);
}
victim->target=0;
victim->targetframe=0;
victim->targetanimation=staggerbackhighanim;
- victim->targetrotation=targetrotation+180;
+ victim->targetyaw=targetyaw+180;
victim->target=0;
- weapons.owner[victim->weaponids[0]]=-1;
+ weapons[victim->weaponids[0]].owner=-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[weaponids[0]]=0;
- weapons.freetime[victim->weaponids[0]]=0;
- weapons.firstfree[victim->weaponids[0]]=1;
- weapons.physics[victim->weaponids[0]]=1;
+ weapons[victim->weaponids[0]].velocity=aim*-.2;
+ weapons[victim->weaponids[0]].tipvelocity=aim;
+ weapons[victim->weaponids[0]].missed=1;
+ weapons[weaponids[0]].hitsomething=0;
+ weapons[victim->weaponids[0]].freetime=0;
+ weapons[victim->weaponids[0]].firstfree=1;
+ weapons[victim->weaponids[0]].physics=1;
victim->num_weapons--;
if(victim->num_weapons){
victim->weaponids[0]=victim->weaponids[num_weapons];
if(targetanimation==staffhitanim&&animation[targetanimation].label[currentframe]==5&&victim->targetanimation!=rollanim){
if(findDistancefast(&coords,&victim->coords)<(scale*5)*(scale*5)*6.5&&victim->targetanimation!=dodgebackanim&&victim->targetanimation!=sweepanim){
if(tutoriallevel!=1){
- weapons.damage[weaponids[0]]+=.4+float(abs(Random()%100)-50)/250;
+ weapons[weaponids[0]].damage+=.4+float(abs(Random()%100)-50)/250;
escapednum=0;
if(id==0)camerashake+=.4;
if(Random()%2||creature==wolftype){
if(targetanimation==staffspinhitanim&&animation[targetanimation].label[currentframe]==5&&victim->targetanimation!=rollanim){
if(findDistancefast(&coords,&victim->coords)<(scale*5)*(scale*5)*6.5&&victim->targetanimation!=dodgebackanim&&victim->targetanimation!=sweepanim){
if(tutoriallevel!=1){
- weapons.damage[weaponids[0]]+=.6+float(abs(Random()%100)-50)/250;
+ weapons[weaponids[0]].damage+=.6+float(abs(Random()%100)-50)/250;
escapednum=0;
if(id==0)camerashake+=.4;
if(Random()%2||creature==wolftype){
if(findDistancefast(&coords,&victim->coords)<(scale*5)*(scale*5)*6.5){
escapednum=0;
if(tutoriallevel!=1){
- if(!victim->dead)weapons.damage[weaponids[0]]+=.4+float(abs(Random()%100)-50)/500;
+ if(!victim->dead)weapons[weaponids[0]].damage+=.4+float(abs(Random()%100)-50)/500;
if(id==0)camerashake+=.4;
if(Random()%2||creature==wolftype){
victim->spurt=1;
victim->skeleton.joints[victim->skeleton.jointlabels[abdomen]].velocity+=relative*damagemult*200;
victim->targetframe=0;
victim->targetanimation=staggerbackhighanim;
- victim->targetrotation=targetrotation+180;
+ victim->targetyaw=targetyaw+180;
victim->target=0;
if(tutoriallevel!=1){
emit_sound_at(landsound2, victim->coords, 128.);
victim->skeleton.joints[victim->skeleton.jointlabels[abdomen]].velocity+=relative*damagemult*200;
victim->targetframe=0;
victim->targetanimation=staggerbackhighanim;
- victim->targetrotation=targetrotation+180;
+ victim->targetyaw=targetyaw+180;
victim->target=0;
if(tutoriallevel!=1){
emit_sound_at(landsound2, victim->coords, 128.);
if((targetanimation==swordslashreversalanim||targetanimation==knifeslashreversalanim||targetanimation==staffhitreversalanim||targetanimation==staffspinhitreversalanim)&&animation[targetanimation].label[currentframe]==5){
if(victim->weaponactive!=-1&&victim->num_weapons>0){
- if(weapons.owner[victim->weaponids[victim->weaponactive]]==victim->id){
- weapons.owner[victim->weaponids[victim->weaponactive]]=id;
+ if(weapons[victim->weaponids[victim->weaponactive]].owner==victim->id){
+ weapons[victim->weaponids[victim->weaponactive]].owner=id;
weaponactive=0;
if(num_weapons>0){
weaponids[num_weapons]=weaponids[victim->weaponactive];
bool doslice;
doslice=0;
if(weaponactive!=-1||creature==wolftype)doslice=1;
- if(creature==rabbittype&&weaponactive!=-1)if(weapons.type[weaponids[0]]==staff)doslice=0;
+ if(creature==rabbittype&&weaponactive!=-1)if(weapons[weaponids[0]].getType()==staff)doslice=0;
if(doslice){
if(weaponactive!=-1){
victim->DoBloodBig(2/victim->armorhigh,225);
emit_sound_at(knifeslicesound, victim->coords);
- if(bloodtoggle&&!weapons.bloody[weaponids[weaponactive]])weapons.bloody[weaponids[weaponactive]]=1;
- weapons.blooddrip[weaponids[weaponactive]]+=3;
+ if(bloodtoggle&&!weapons[weaponids[weaponactive]].bloody)weapons[weaponids[weaponactive]].bloody=1;
+ weapons[weaponids[weaponactive]].blooddrip+=3;
}
if(weaponactive==-1&&creature==wolftype){;
emit_sound_at(clawslicesound, victim->coords, 128.);
bool doslice;
doslice=0;
if(weaponactive!=-1||creature==wolftype)doslice=1;
- if(creature==rabbittype&&weaponactive!=-1)if(weapons.type[weaponids[0]]==staff)doslice=0;
+ if(creature==rabbittype&&weaponactive!=-1)if(weapons[weaponids[0]].getType()==staff)doslice=0;
if(doslice){
if(weaponactive!=-1){
victim->DoBloodBig(200,225);
emit_sound_at(knifeslicesound, victim->coords);
- if(bloodtoggle)weapons.bloody[weaponids[weaponactive]]=2;
- weapons.blooddrip[weaponids[weaponactive]]+=5;
+ if(bloodtoggle)weapons[weaponids[weaponactive]].bloody=2;
+ weapons[weaponids[weaponactive]].blooddrip+=5;
}
if(creature==wolftype&&weaponactive==-1){
bloodvel=0;
bloodvel.z=20;
bloodvel.y=5;
- bloodvel=DoRotation(bloodvel,((float)(Random()%100))/4,rotation+((float)(Random()%100))/4,0)*scale;
- Sprite::MakeSprite(bloodsprite, DoRotation(skeleton.joints[skeleton.jointlabels[neck]].position,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1);
+ bloodvel=DoRotation(bloodvel,((float)(Random()%100))/4,yaw+((float)(Random()%100))/4,0)*scale;
+ Sprite::MakeSprite(bloodsprite, DoRotation(skeleton.joints[skeleton.jointlabels[neck]].position,0,yaw,0)*scale+coords,bloodvel, 1,1,1, .05, 1);
*/
XYZ footvel,footpoint;
footvel=0;
- footpoint=weapons.tippoint[weaponids[0]];
+ footpoint=weapons[weaponids[0]].tippoint;
if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3);
- footvel=(weapons.tippoint[weaponids[0]]-weapons.position[weaponids[0]]);
+ footvel=(weapons[weaponids[0]].tippoint-weapons[weaponids[0]].position);
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);
award_bonus(id, Stabbonus);
XYZ footvel,footpoint;
footvel=0;
- footpoint=weapons.tippoint[weaponids[0]];
+ footpoint=weapons[weaponids[0]].tippoint;
if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3);
- footvel=(weapons.tippoint[weaponids[0]]-weapons.position[weaponids[0]])*-1;
+ footvel=(weapons[weaponids[0]].tippoint-weapons[weaponids[0]].position)*-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);
victim->bloodloss+=10000;
victim->velocity=0;
emit_sound_at(fleshstabsound, victim->coords);
- if(bloodtoggle)weapons.bloody[weaponids[weaponactive]]=2;
- weapons.blooddrip[weaponids[weaponactive]]+=5;
+ if(bloodtoggle)weapons[weaponids[weaponactive]].bloody=2;
+ weapons[weaponids[weaponactive]].blooddrip+=5;
}
}
}
if(weaponactive!=-1&&animation[victim->targetanimation].attack!=reversal){
emit_sound_at(fleshstabremovesound, victim->coords);
- if(bloodtoggle)weapons.bloody[weaponids[weaponactive]]=2;
- weapons.blooddrip[weaponids[weaponactive]]+=5;
+ if(bloodtoggle)weapons[weaponids[weaponactive]].bloody=2;
+ weapons[weaponids[weaponactive]].blooddrip+=5;
XYZ footvel,footpoint;
footvel=0;
- footpoint=weapons.tippoint[weaponids[0]];
+ footpoint=weapons[weaponids[0]].tippoint;
if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3);
- footvel=(weapons.tippoint[weaponids[0]]-weapons.position[weaponids[0]])*-1;
+ footvel=(weapons[weaponids[0]].tippoint-weapons[weaponids[0]].position)*-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);
XYZ footvel,footpoint;
footvel=0;
- footpoint=(weapons.tippoint[weaponids[0]]+weapons.position[weaponids[0]])/2;
+ footpoint=(weapons[weaponids[0]].tippoint+weapons[weaponids[0]].position)/2;
if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3);
- footvel=(weapons.tippoint[weaponids[0]]-weapons.position[weaponids[0]]);
+ footvel=(weapons[weaponids[0]].tippoint-weapons[weaponids[0]].position);
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);
victim->bloodloss+=10000;
victim->velocity=0;
emit_sound_at(fleshstabsound, victim->coords);
- if(bloodtoggle)weapons.bloody[weaponids[weaponactive]]=2;
- weapons.blooddrip[weaponids[weaponactive]]+=5;
+ if(bloodtoggle)weapons[weaponids[weaponactive]].bloody=2;
+ weapons[weaponids[weaponactive]].blooddrip+=5;
}
}
}
if(weaponactive!=-1){
emit_sound_at(fleshstabremovesound, victim->coords);
- if(bloodtoggle)weapons.bloody[weaponids[weaponactive]]=2;
- weapons.blooddrip[weaponids[weaponactive]]+=5;
+ if(bloodtoggle)weapons[weaponids[weaponactive]].bloody=2;
+ weapons[weaponids[weaponactive]].blooddrip+=5;
XYZ footvel,footpoint;
footvel=0;
- footpoint=weapons.tippoint[weaponids[0]];
+ footpoint=weapons[weaponids[0]].tippoint;
if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3);
- footvel=(weapons.tippoint[weaponids[0]]-weapons.position[weaponids[0]])*-1;
+ footvel=(weapons[weaponids[0]].tippoint-weapons[weaponids[0]].position)*-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);
bool doslice;
doslice=0;
if(weaponactive!=-1||creature==wolftype)doslice=1;
- if(creature==rabbittype&&weaponactive!=-1)if(weapons.type[weaponids[0]]==staff)doslice=0;
+ if(creature==rabbittype&&weaponactive!=-1)if(weapons[weaponids[0]].getType()==staff)doslice=0;
if(doslice){
if(weaponactive!=-1){
victim->DoBloodBig(2/victim->armorhead,225);
emit_sound_at(knifeslicesound, victim->coords);
- if(bloodtoggle&&!weapons.bloody[weaponids[weaponactive]])weapons.bloody[weaponids[weaponactive]]=1;
- weapons.blooddrip[weaponids[weaponactive]]+=3;
+ if(bloodtoggle&&!weapons[weaponids[weaponactive]].bloody)weapons[weaponids[weaponactive]].bloody=1;
+ weapons[weaponids[weaponactive]].blooddrip+=3;
}
if(weaponactive==-1&&creature==wolftype){
emit_sound_at(clawslicesound, victim->coords, 128.);
targetframe=0;
XYZ rotatetarget=victim->coords-coords;
Normalise(&rotatetarget);
- rotation=-asin(0-rotatetarget.x);
- rotation*=360/6.28;
- if(rotatetarget.z<0)rotation=180-rotation;
+ yaw=-asin(0-rotatetarget.x);
+ yaw*=360/6.28;
+ if(rotatetarget.z<0)yaw=180-yaw;
targettilt2=-asin(rotatetarget.y)*360/6.28;
velocity=(victim->coords-coords)*4;
velocity.y+=2;
if(targetanimation==walljumprightanim){
targetanimation=rightflipanim;
targetframe=4;
- targetrotation-=90;
- rotation-=90;
+ targetyaw-=90;
+ yaw-=90;
velocity=DoRotation(facing,0,30,0)*-8;
velocity.y=4;
}
if(targetanimation==walljumpfrontanim){
targetanimation=frontflipanim;
targetframe=2;
- //targetrotation-=180;
- ////rotation-=180;
+ //targetyaw-=180;
+ ////yaw-=180;
velocity=facing*8;
velocity.y=4;
}
targetframe=0;
XYZ rotatetarget=victim->coords-coords;
Normalise(&rotatetarget);
- rotation=-asin(0-rotatetarget.x);
- rotation*=360/6.28;
- if(rotatetarget.z<0)rotation=180-rotation;
+ yaw=-asin(0-rotatetarget.x);
+ yaw*=360/6.28;
+ if(rotatetarget.z<0)yaw=180-yaw;
targettilt2=-asin(rotatetarget.y)*360/6.28;
velocity=(victim->coords-coords)*4;
velocity.y+=2;
if(targetanimation!=walljumpleftkickanim){
targetanimation=leftflipanim;
targetframe=4;
- targetrotation+=90;
- rotation+=90;
+ targetyaw+=90;
+ yaw+=90;
velocity=DoRotation(facing,0,-30,0)*-8;
velocity.y=4;
}
resume_stream(whooshsound);
}
if(targetanimation==sneakattackanim){
- float ycoords=oldcoords.y;
currentanimation=getCrouch();
targetanimation=getCrouch();
targetframe=1;
currentframe=0;
- targetrotation+=180;
- rotation+=180;
+ targetyaw+=180;
+ yaw+=180;
targettilt2*=-1;
tilt2*=-1;
transspeed=1000000;
- targetheadrotation+=180;
+ targetheadyaw+=180;
coords-=facing*.7;
if(onterrain)coords.y=terrain.getHeight(coords.x,coords.z);
lastfeint=0;
}
if(targetanimation==knifesneakattackanim||targetanimation==swordsneakattackanim){
- float ycoords=oldcoords.y;
targetanimation=getIdle();
targetframe=0;
if(onterrain)coords.y=terrain.getHeight(coords.x,coords.z);
if(animation[targetanimation].attack==reversal&¤tanimation!=sneakattackanim&¤tanimation!=knifesneakattackanim&¤tanimation!=swordsneakattackanim&¤tanimation!=knifefollowanim){
float ycoords=oldcoords.y;
targetanimation=getStop();
- targetrotation+=180;
- rotation+=180;
+ targetyaw+=180;
+ yaw+=180;
targettilt2*=-1;
tilt2*=-1;
transspeed=1000000;
- targetheadrotation+=180;
+ targetheadyaw+=180;
if(!isnormal(coords.x))
coords=oldcoords;
if(currentanimation==spinkickreversalanim||currentanimation==swordslashreversalanim)
oldcoords=coords+facing*1.1;
else if(currentanimation==upunchreversalanim){
oldcoords=coords+facing*1.5;
- targetrotation+=180;
- rotation+=180;
- targetheadrotation+=180;
+ targetyaw+=180;
+ yaw+=180;
+ targetheadyaw+=180;
targettilt2*=-1;
tilt2*=-1;
}
else if(currentanimation==knifeslashreversalanim){
oldcoords=coords+facing*.5;
- targetrotation+=90;
- rotation+=90;
- targetheadrotation+=90;
+ targetyaw+=90;
+ yaw+=90;
+ targetheadyaw+=90;
targettilt2=0;
tilt2=0;
}
else if(currentanimation==staffspinhitreversalanim){
- targetrotation+=180;
- rotation+=180;
- targetheadrotation+=180;
+ targetyaw+=180;
+ yaw+=180;
+ targetheadyaw+=180;
targettilt2=0;
tilt2=0;
}
}
if(animation[targetanimation].attack==reversed){
escapednum++;
- if(targetanimation==sweepreversedanim)targetrotation+=90;
+ if(targetanimation==sweepreversedanim)targetyaw+=90;
targetanimation=backhandspringanim;
targetframe=2;
emit_sound_at(landsound, coords, 128);
targetanimation=rollanim;
targetframe=5;
oldcoords=coords;
- coords+=(DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,rotation,0)+DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,rotation,0))/2*scale;
+ coords+=(DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,yaw,0)+DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,yaw,0))/2*scale;
coords.y=oldcoords.y;
}
if(currentanimation==knifeslashreversedanim){
targetanimation=rollanim;
targetframe=0;
- targetrotation+=90;
- rotation+=90;
+ targetyaw+=90;
+ yaw+=90;
oldcoords=coords;
- coords+=(DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,rotation,0)+DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,rotation,0))/2*scale;
+ coords+=(DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,yaw,0)+DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,yaw,0))/2*scale;
coords.y=oldcoords.y;
}
}
if(currentanimation==spinkickanim||currentanimation==getupfrombackanim||currentanimation==getupfromfrontanim||currentanimation==lowkickanim){
targetanimation=getIdle();
oldcoords=coords;
- coords+=(DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,rotation,0)+DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,rotation,0))/2*scale;
+ coords+=(DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,yaw,0)+DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,yaw,0))/2*scale;
coords.y=oldcoords.y;
- //coords+=DoRotation(animation[currentanimation].offset,0,rotation,0)*scale;
+ //coords+=DoRotation(animation[currentanimation].offset,0,yaw,0)*scale;
targetoffset.y=coords.y;
if(onterrain)targetoffset.y=terrain.getHeight(coords.x,coords.z);
- currentoffset=DoRotation(animation[currentanimation].offset*-1,0,rotation,0)*scale;
+ currentoffset=DoRotation(animation[currentanimation].offset*-1,0,yaw,0)*scale;
currentoffset.y-=(coords.y-targetoffset.y);
coords.y=targetoffset.y;
targetoffset=0;
lastfeint=0;
}
if(currentanimation==rabbitkickanim&&targetanimation!=backflipanim){
- targetrotation=rotation;
+ targetyaw=yaw;
bool hasstaff;
hasstaff=0;
- if(num_weapons>0)if(weapons.type[0]==staff)hasstaff=1;
+ if(num_weapons>0)if(weapons[0].getType()==staff)hasstaff=1;
if(!hasstaff)DoDamage(35);
RagDoll(0);
lastfeint=0;
if(target>1){currentframe=targetframe; target=1;}
oldrot=rot;
rot=targetrot*target;
- rotation+=rot-oldrot;
+ yaw+=rot-oldrot;
if(target==1){
rot=0;
oldrot=0;
static int howmany;
static int bloodsize;
static int startx,starty,endx,endy;
- static int texdetailint;
static GLubyte color;
static XYZ bloodvel;
}
}
if(weaponactive==-1&&num_weapons>0){
- if(weapons.type[weaponids[0]]==staff){
+ if(weapons[weaponids[0]].getType()==staff){
weaponactive=0;
}
}
howmany=abs(Random()%(skeleton.num_joints));
if(!skeleton.free)flatvelocity=(coords-oldcoords)/multiplier/2;//velocity/2;
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=DoRotation(DoRotation(DoRotation(skeleton.joints[howmany].position,0,0,tilt),tilt2,0,0),0,yaw,0)*scale+coords;
if(skeleton.free)flatfacing=skeleton.joints[howmany].position*scale+coords;
Sprite::MakeSprite(flamesprite, flatfacing,flatvelocity, 1,1,1, .6+(float)abs(Random()%100)/200-.25, 1);
}
howmany=abs(Random()%(skeleton.num_joints));
if(!skeleton.free)flatvelocity=(coords-oldcoords)/multiplier/2;//velocity/2;
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=DoRotation(DoRotation(DoRotation(skeleton.joints[howmany].position,0,0,tilt),tilt2,0,0),0,yaw,0)*scale+coords;
if(skeleton.free)flatfacing=skeleton.joints[howmany].position*scale+coords;
Sprite::MakeSprite(breathsprite, flatfacing,flatvelocity, 1,1,1, .6+(float)abs(Random()%100)/200-.25, .3);
}
if(bleeding>0){
bleeding-=multiplier*.3;
if(bloodtoggle==2){
- glBindTexture(GL_TEXTURE_2D,skeleton.drawmodel.textureptr);
+ skeleton.drawmodel.textureptr.bind();
if(bleeding<=0&&(detail!=2||osx))DoMipmaps();
}
}
bloodvel=0;
if(!skeleton.free){
bloodvel.z=5*neckspurtamount;
- bloodvel=DoRotation(bloodvel,((float)(Random()%100))/40,rotation+((float)(Random()%100))/40,0)*scale;
+ bloodvel=DoRotation(bloodvel,((float)(Random()%100))/40,yaw+((float)(Random()%100))/40,0)*scale;
}
if(skeleton.free){
bloodvel-=DoRotation(skeleton.forward*10*scale,((float)(Random()%100))/40,((float)(Random()%100))/40,0);
}
- 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(skeleton.joints[skeleton.jointlabels[head]].velocity,((float)(Random()%100))/40,yaw+((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)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);
+ 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,yaw,0)*scale+coords,bloodvel, 1,1,1, .05, .9);
neckspurtparticledelay=.05;
}
if(neckspurtdelay<0){
XYZ bloodvel;
if(bloodtoggle){
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(skeleton.joints[skeleton.jointlabels[abdomen]].velocity,((float)(Random()%100))/4,yaw+((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)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(!skeleton.free)Sprite::MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[abdomen]].position+skeleton.joints[skeleton.jointlabels[abdomen]].position)/2,0,yaw,0)*scale+coords,bloodvel, 1,1,1, .05, 1);
}
}
bloodloss+=deathbleeding*multiplier*80;
if(deathbleeding<0)deathbleeding=0;
if(bloodloss>damagetolerance&&animation[targetanimation].attack==neutral){
if(weaponactive!=-1){
- weapons.owner[weaponids[0]]=-1;
- weapons.velocity[weaponids[0]]=velocity*scale*-.3;
- weapons.velocity[weaponids[0]].x+=.01;
- weapons.tipvelocity[weaponids[0]]=velocity*scale;
- weapons.missed[weaponids[0]]=1;
- weapons.hitsomething[weaponids[0]]=0;
- weapons.freetime[weaponids[0]]=0;
- weapons.firstfree[weaponids[0]]=1;
- weapons.physics[weaponids[0]]=1;
+ weapons[weaponids[0]].owner=-1;
+ weapons[weaponids[0]].velocity=velocity*scale*-.3;
+ weapons[weaponids[0]].velocity.x+=.01;
+ weapons[weaponids[0]].tipvelocity=velocity*scale;
+ weapons[weaponids[0]].missed=1;
+ weapons[weaponids[0]].hitsomething=0;
+ weapons[weaponids[0]].freetime=0;
+ weapons[weaponids[0]].firstfree=1;
+ weapons[weaponids[0]].physics=1;
num_weapons--;
if(num_weapons){
weaponids[0]=weaponids[num_weapons];
startx=0;
starty=0;
- texdetailint=realtexdetail;
startx=bleedy;//abs(Random()%(skeleton.skinsize-bloodsize-1));
starty=bleedx;//abs(Random()%(skeleton.skinsize-bloodsize-1));
endx=startx+bloodsize;
}
}
if(!osx&&detail>1){
- glBindTexture(GL_TEXTURE_2D,skeleton.drawmodel.textureptr);
+ skeleton.drawmodel.textureptr.bind();
DoMipmaps();
}
if(environment==snowyenvironment){
XYZ footpoint;
XYZ footvel;
- if(!skeleton.free)footvel=DoRotation(skeleton.specialforward[0],0,rotation,0)*-1;
+ if(!skeleton.free)footvel=DoRotation(skeleton.specialforward[0],0,yaw,0)*-1;
if(skeleton.free)footvel=skeleton.specialforward[0]*-1;
- if(!skeleton.free)footpoint=DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords;
+ if(!skeleton.free)footpoint=DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,yaw,0)*scale+coords;
if(skeleton.free)footpoint=((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2)*scale+coords;
if(targetanimation==sleepanim)footvel=DoRotation(footvel,0,90,0);
Sprite::MakeSprite(breathsprite, footpoint+footvel*.2,footvel*.4, 1,1,1, .4, .3);
if(bloodtoggle&&!bled)
for(l=0;l<terrain.patchobjectnum[whichpatchx][whichpatchz];l++){
j=terrain.patchobjects[whichpatchx][whichpatchz][l];
- XYZ point=DoRotation(headpoint-objects.position[j],0,-objects.rotation[j],0);
+ XYZ point=DoRotation(headpoint-objects.position[j],0,-objects.yaw[j],0);
float size=.8;
float opacity=.6;
- float rotation=0;
- objects.model[j].MakeDecal(blooddecalslow,&point,&size,&opacity,&rotation);
+ float yaw=0;
+ objects.model[j].MakeDecal(blooddecalslow,&point,&size,&opacity,&yaw);
}
bled=1;
}
RagDoll(0);
if(weaponactive!=-1){
- weapons.owner[weaponids[0]]=-1;
- weapons.velocity[weaponids[0]]=velocity*scale*-.3;
- weapons.velocity[weaponids[0]].x+=.01;
- weapons.tipvelocity[weaponids[0]]=velocity*scale;
- weapons.missed[weaponids[0]]=1;
- weapons.hitsomething[weaponids[0]]=0;
- weapons.freetime[weaponids[0]]=0;
- weapons.firstfree[weaponids[0]]=1;
- weapons.physics[weaponids[0]]=1;
+ weapons[weaponids[0]].owner=-1;
+ weapons[weaponids[0]].velocity=velocity*scale*-.3;
+ weapons[weaponids[0]].velocity.x+=.01;
+ weapons[weaponids[0]].tipvelocity=velocity*scale;
+ weapons[weaponids[0]].missed=1;
+ weapons[weaponids[0]].hitsomething=0;
+ weapons[weaponids[0]].freetime=0;
+ weapons[weaponids[0]].firstfree=1;
+ weapons[weaponids[0]].physics=1;
num_weapons--;
if(num_weapons){
weaponids[0]=weaponids[num_weapons];
DoBlood(1,255);
if(weaponactive!=-1){
- weapons.owner[weaponids[0]]=-1;
- weapons.velocity[weaponids[0]]=velocity*scale*-.3;
- weapons.velocity[weaponids[0]].x+=.01;
- weapons.tipvelocity[weaponids[0]]=velocity*scale;
- weapons.missed[weaponids[0]]=1;
- weapons.hitsomething[weaponids[0]]=0;
- weapons.freetime[weaponids[0]]=0;
- weapons.firstfree[weaponids[0]]=1;
- weapons.physics[weaponids[0]]=1;
+ weapons[weaponids[0]].owner=-1;
+ weapons[weaponids[0]].velocity=velocity*scale*-.3;
+ weapons[weaponids[0]].velocity.x+=.01;
+ weapons[weaponids[0]].tipvelocity=velocity*scale;
+ weapons[weaponids[0]].missed=1;
+ weapons[weaponids[0]].hitsomething=0;
+ weapons[weaponids[0]].freetime=0;
+ weapons[weaponids[0]].firstfree=1;
+ weapons[weaponids[0]].physics=1;
num_weapons--;
if(num_weapons){
weaponids[0]=weaponids[num_weapons];
velocity=0;
}
- 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(findLength(&average)<10&&dead&&skeleton.free){
skeleton.longdead+=(2000-findLength(&average))*multiplier+multiplier;
if(skeleton.longdead>2000){
if(bloodtoggle&&!bled)
for(l=0;l<terrain.patchobjectnum[whichpatchx][whichpatchz];l++){
j=terrain.patchobjects[whichpatchx][whichpatchz][l];
- XYZ point=DoRotation(headpoint-objects.position[j],0,-objects.rotation[j],0);
+ XYZ point=DoRotation(headpoint-objects.position[j],0,-objects.yaw[j],0);
float size=.2*1.2;
float opacity=.6;
- float rotation=0;
- objects.model[j].MakeDecal(blooddecal,&point,&size,&opacity,&rotation);
+ float yaw=0;
+ objects.model[j].MakeDecal(blooddecal,&point,&size,&opacity,&yaw);
}
bled=1;
}
if(bloodtoggle&&!bled)
for(l=0;l<terrain.patchobjectnum[whichpatchx][whichpatchz];l++){
j=terrain.patchobjects[whichpatchx][whichpatchz][l];
- XYZ point=DoRotation(headpoint-objects.position[j],0,-objects.rotation[j],0);
+ XYZ point=DoRotation(headpoint-objects.position[j],0,-objects.yaw[j],0);
float size=.8;
float opacity=.6;
- float rotation=0;
- objects.model[j].MakeDecal(blooddecalslow,&point,&size,&opacity,&rotation);
+ float yaw=0;
+ objects.model[j].MakeDecal(blooddecalslow,&point,&size,&opacity,&yaw);
}
bled=1;
}
if(objects.type[i]!=treeleavestype&&objects.type[i]!=bushtype&&objects.type[i]!=firetype){
colviewer=startpoint;
coltarget=endpoint;
- if(objects.model[i].LineCheck(&colviewer,&coltarget,&colpoint,&objects.position[i],&objects.rotation[i])!=-1)canrecover=0;
+ if(objects.model[i].LineCheck(&colviewer,&coltarget,&colpoint,&objects.position[i],&objects.yaw[i])!=-1)canrecover=0;
}
}
if(canrecover){
}
Normalise(&terrainnormal);
- targetrotation=-asin(0-terrainnormal.x);
- targetrotation*=360/6.28;
- if(terrainnormal.z<0)targetrotation=180-targetrotation;
- rotation=targetrotation;
+ targetyaw=-asin(0-terrainnormal.x);
+ targetyaw*=360/6.28;
+ if(terrainnormal.z<0)targetyaw=180-targetyaw;
+ yaw=targetyaw;
targetframe=0;
// targetframe=2;
for(i=0;i<skeleton.num_joints;i++){
tempanimation.position[i][0]=skeleton.joints[i].position;
- tempanimation.position[i][0]=DoRotation(tempanimation.position[i][0],0,-rotation,0);
+ tempanimation.position[i][0]=DoRotation(tempanimation.position[i][0],0,-yaw,0);
}
}
}
}
Normalise(&terrainnormal);
- targetrotation=-asin(0-terrainnormal.x);
- targetrotation*=360/6.28;
- if(terrainnormal.z<0)targetrotation=180-targetrotation;
- rotation=targetrotation;
-
- /*if(onterrain){
- terrainnormal=terrain.getNormal(coords.x,coords.z);
- targettilt2=asin(terrainnormal.y)*180/3.14*-1;
- }
- else*/
-
- /*XYZ otherterrainnormal;
- otherterrainnormal=terrain.getNormal(coords.x,coords.y);
- otherterrainnormal.y=fast_sqrt(otherterrainnormal.x*otherterrainnormal.x+otherterrainnormal.z*otherterrainnormal.z)*-1;
- if(abs(terrainnormal.y)<abs(otherterrainnormal.y))terrainnormal.y=fast_sqrt(otherterrainnormal.x*otherterrainnormal.x+otherterrainnormal.z*otherterrainnormal.z)*-1;
- targettilt2=asin(otherterrainnormal.y)*180/3.14;
- */
+ targetyaw=-asin(0-terrainnormal.x);
+ targetyaw*=360/6.28;
+ if(terrainnormal.z<0)targetyaw=180-targetyaw;
+ yaw=targetyaw;
targettilt2=asin(terrainnormal.y)*180/3.14*-1;
-
if(skeleton.forward.y<0){
targetanimation=getupfrombackanim;
targetframe=0;
}
if(skeleton.forward.y>-.3){
targetanimation=getupfromfrontanim;
- rotation+=180;
- targetrotation+=180;
+ yaw+=180;
+ targetyaw+=180;
targettilt2*=-1;
targetframe=0;
targettilt2=0;
if((Random()%8==0&&id!=0&&creature==rabbittype)||(Random()%2==0&&id!=0&&creature==wolftype)||(id==0&&crouchkeydown&&(forwardkeydown||backkeydown||leftkeydown||rightkeydown))){
targetanimation=rollanim;
- targetrotation=lookrotation;
+ targetyaw=lookyaw;
if(id==0){
if(rightkeydown){
- targetrotation-=90;
- if(forwardkeydown)targetrotation+=45;
- if(backkeydown)targetrotation-=45;
+ targetyaw-=90;
+ if(forwardkeydown)targetyaw+=45;
+ if(backkeydown)targetyaw-=45;
}
if(leftkeydown){
- targetrotation+=90;
- if(forwardkeydown)targetrotation-=45;
- if(backkeydown)targetrotation+=45;
+ targetyaw+=90;
+ if(forwardkeydown)targetyaw-=45;
+ if(backkeydown)targetyaw+=45;
}
if(backkeydown){
if ( !leftkeydown&&!rightkeydown)
- targetrotation+=180;
+ targetyaw+=180;
}
- targetrotation+=180;
+ targetyaw+=180;
}
}
for(i=0;i<skeleton.num_joints;i++){
tempanimation.position[i][0]=skeleton.joints[i].position;
- tempanimation.position[i][0]=DoRotation(tempanimation.position[i][0],0,-rotation,0);
+ tempanimation.position[i][0]=DoRotation(tempanimation.position[i][0],0,-yaw,0);
}
}
}
bool hasstaff;
hasstaff=0;
- if(num_weapons>0)if(weapons.type[0]==staff)hasstaff=1;
+ if(num_weapons>0)if(weapons[0].getType()==staff)hasstaff=1;
if(!skeleton.freefall&&freefall&&((jumpkeydown&&jumpkeydowntime<.2)||(hasstaff&&rabbitkickragdoll))&&!dead){
if(velocity.y>-30){
XYZ tempvelocity;
tempvelocity=velocity;
Normalise(&tempvelocity);
- targetrotation=-asin(0-tempvelocity.x);
- targetrotation*=360/6.28;
- if(velocity.z<0)targetrotation=180-targetrotation;
- //targetrotation+=180;
+ targetyaw=-asin(0-tempvelocity.x);
+ targetyaw*=360/6.28;
+ if(velocity.z<0)targetyaw=180-targetyaw;
+ //targetyaw+=180;
skeleton.free=0;
if(dotproduct(&skeleton.forward,&tempvelocity)<0){
}
else{
targetanimation=backhandspringanim;
- targetrotation+=180;
+ targetyaw+=180;
targetframe=6;
}
target=0;
velocity=0;
- rotation=targetrotation;
+ yaw=targetyaw;
tilt=0;
targettilt=0;
tilt2=0;
}
if(skeleton.freefall==0)freefall=0;
- if(!isnormal(velocity.x)&&velocity.x){
- int xy=1;
- }
}
if(aitype!=passivetype||skeleton.free==1)
}
XYZ tempcoord;
if(objects.type[i]==treeleavestype&&environment!=desertenvironment){
- if(objects.rotation2[i]==0)tempcoord=coords;
+ if(objects.pitch[i]==0)tempcoord=coords;
else{
tempcoord=coords-objects.position[i];
- tempcoord=DoRotation(tempcoord,0,-objects.rotation[i],0);
- tempcoord=DoRotation(tempcoord,-objects.rotation2[i],0,0);
+ tempcoord=DoRotation(tempcoord,0,-objects.yaw[i],0);
+ tempcoord=DoRotation(tempcoord,-objects.pitch[i],0,0);
tempcoord+=objects.position[i];
}
if(findDistancefastflat(&tempcoord,&objects.position[i])<objects.scale[i]*objects.scale[i]*8&&findDistancefast(&tempcoord,&objects.position[i])<objects.scale[i]*objects.scale[i]*300&&tempcoord.y>objects.position[i].y+3*objects.scale[i]){
if(!isnormal(targettilt2)&&targettilt2){
targettilt2=0;
}
- if(!isnormal(targetrotation)&&targetrotation){
- targetrotation=0;
+ if(!isnormal(targetyaw)&&targetyaw){
+ targetyaw=0;
}
if(targetanimation==bounceidleanim||targetanimation==wolfidle||targetanimation==walkanim||targetanimation==drawrightanim||targetanimation==crouchdrawrightanim||targetanimation==drawleftanim||targetanimation==fightidleanim||targetanimation==fightsidestep||targetanimation==hanganim||isCrouch()||targetanimation==backhandspringanim){
targetheadmorphness=1;
}
}
- /*
- if(speechdelay>.25){
- if(headmorphend!=2)headmorphness=0;
- headmorphend=2;
- targetheadmorphness=1;
- }
- */
+
bool behind;
behind=0;
if(hasvictim){
}
if(weaponactive!=-1){
- if(weapons.type[weaponids[weaponactive]]!=staff){
+ if(weapons[weaponids[weaponactive]].getType()!=staff){
righthandmorphstart=1;
righthandmorphend=1;
}
- if(weapons.type[weaponids[weaponactive]]==staff){
+ if(weapons[weaponids[weaponactive]].getType()==staff){
righthandmorphstart=2;
righthandmorphend=2;
}
flatfacing=0;
flatfacing.z=1;
- flatfacing=DoRotation(flatfacing,0,rotation,0);
+ flatfacing=DoRotation(flatfacing,0,yaw,0);
facing=flatfacing;
ReflectVector(&facing,terrainnormal);
Normalise(&facing);
if(animation[targetanimation].attack==normalattack&&targetanimation!=rabbitkickanim&&!victim->skeleton.free){
terrainnormal=victim->coords-coords;
Normalise(&terrainnormal);
- targetrotation=-asin(0-terrainnormal.x);
- targetrotation*=360/6.28;
- if(terrainnormal.z<0)targetrotation=180-targetrotation;
+ targetyaw=-asin(0-terrainnormal.x);
+ targetyaw*=360/6.28;
+ if(terrainnormal.z<0)targetyaw=180-targetyaw;
targettilt2=-asin(terrainnormal.y)*360/6.28;//*-70;
}
if(animation[targetanimation].attack==reversal&&targetanimation!=rabbittacklinganim){
- targetrotation=victim->targetrotation;
+ targetyaw=victim->targetyaw;
}
if(targetanimation==rabbittacklinganim){
coords=victim->coords;
XYZ terrainlight;
float terrainheight;
float distance;
- if(!isnormal(rotation))rotation=0;
+ if(!isnormal(yaw))yaw=0;
if(!isnormal(tilt))tilt=0;
if(!isnormal(tilt2))tilt2=0;
oldplayerdetail=playerdetail;
static float M[16];
static int i,j,k;
static int weaponattachmuscle;
- static int weaponrotatemuscle,weaponrotatemuscle2;
+ static int weaponrotatemuscle;
static XYZ weaponpoint;
static int start,endthing;
if((dead!=2||skeleton.free!=2)&&updatedelay<=0){
if(!isSleeping()&&!isSitting()){
if(onterrain&&((isIdle()||isCrouch()||isLanding()||isLandhard()||targetanimation==drawrightanim||targetanimation==drawleftanim||targetanimation==crouchdrawrightanim)&&(wasIdle()||wasCrouch()||wasLanding()||wasLandhard()||currentanimation==drawrightanim||currentanimation==drawleftanim||currentanimation==crouchdrawrightanim))&&!skeleton.free){
XYZ point,newpoint,change,change2;
- point=DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,rotation,0)*scale+coords;
+ point=DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,yaw,0)*scale+coords;
heightleft=terrain.getHeight(point.x,point.z)+.04;
point.y=heightleft;
change=skeleton.joints[skeleton.jointlabels[leftankle]].position-skeleton.joints[skeleton.jointlabels[leftfoot]].position;
change2=skeleton.joints[skeleton.jointlabels[leftknee]].position-skeleton.joints[skeleton.jointlabels[leftfoot]].position;
- skeleton.joints[skeleton.jointlabels[leftfoot]].position=DoRotation((point-coords)/scale,0,-rotation,0);
+ skeleton.joints[skeleton.jointlabels[leftfoot]].position=DoRotation((point-coords)/scale,0,-yaw,0);
skeleton.joints[skeleton.jointlabels[leftankle]].position=skeleton.joints[skeleton.jointlabels[leftfoot]].position+change;
skeleton.joints[skeleton.jointlabels[leftknee]].position=(skeleton.joints[skeleton.jointlabels[leftfoot]].position+change2)/2+(skeleton.joints[skeleton.jointlabels[leftknee]].position)/2;
- point=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,rotation,0)*scale+coords;
+ point=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,yaw,0)*scale+coords;
heightright=terrain.getHeight(point.x,point.z)+.04;
point.y=heightright;
change=skeleton.joints[skeleton.jointlabels[rightankle]].position-skeleton.joints[skeleton.jointlabels[rightfoot]].position;
change2=skeleton.joints[skeleton.jointlabels[rightknee]].position-skeleton.joints[skeleton.jointlabels[rightfoot]].position;
- skeleton.joints[skeleton.jointlabels[rightfoot]].position=DoRotation((point-coords)/scale,0,-rotation,0);
+ skeleton.joints[skeleton.jointlabels[rightfoot]].position=DoRotation((point-coords)/scale,0,-yaw,0);
skeleton.joints[skeleton.jointlabels[rightankle]].position=skeleton.joints[skeleton.jointlabels[rightfoot]].position+change;
skeleton.joints[skeleton.jointlabels[rightknee]].position=(skeleton.joints[skeleton.jointlabels[rightfoot]].position+change2)/2+(skeleton.joints[skeleton.jointlabels[rightknee]].position)/2;
skeleton.DoConstraints(&coords,&scale);
if(creature==wolftype){
- point=DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,rotation,0)*scale+coords;
+ point=DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,yaw,0)*scale+coords;
heightleft=terrain.getHeight(point.x,point.z)+.04;
point.y=heightleft;
change=skeleton.joints[skeleton.jointlabels[leftankle]].position-skeleton.joints[skeleton.jointlabels[leftfoot]].position;
change2=skeleton.joints[skeleton.jointlabels[leftknee]].position-skeleton.joints[skeleton.jointlabels[leftfoot]].position;
- skeleton.joints[skeleton.jointlabels[leftfoot]].position=DoRotation((point-coords)/scale,0,-rotation,0);
+ skeleton.joints[skeleton.jointlabels[leftfoot]].position=DoRotation((point-coords)/scale,0,-yaw,0);
skeleton.joints[skeleton.jointlabels[leftankle]].position=skeleton.joints[skeleton.jointlabels[leftfoot]].position+change;
skeleton.joints[skeleton.jointlabels[leftknee]].position=(skeleton.joints[skeleton.jointlabels[leftfoot]].position+change2)/2+(skeleton.joints[skeleton.jointlabels[leftknee]].position)/2;
- point=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,rotation,0)*scale+coords;
+ point=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,yaw,0)*scale+coords;
heightright=terrain.getHeight(point.x,point.z)+.04;
point.y=heightright;
change=skeleton.joints[skeleton.jointlabels[rightankle]].position-skeleton.joints[skeleton.jointlabels[rightfoot]].position;
change2=skeleton.joints[skeleton.jointlabels[rightknee]].position-skeleton.joints[skeleton.jointlabels[rightfoot]].position;
- skeleton.joints[skeleton.jointlabels[rightfoot]].position=DoRotation((point-coords)/scale,0,-rotation,0);
+ skeleton.joints[skeleton.jointlabels[rightfoot]].position=DoRotation((point-coords)/scale,0,-yaw,0);
skeleton.joints[skeleton.jointlabels[rightankle]].position=skeleton.joints[skeleton.jointlabels[rightfoot]].position+change;
skeleton.joints[skeleton.jointlabels[rightknee]].position=(skeleton.joints[skeleton.jointlabels[rightfoot]].position+change2)/2+(skeleton.joints[skeleton.jointlabels[rightknee]].position)/2;
skeleton.DoConstraints(&coords,&scale);
}
if(onterrain&&((isIdle()||isCrouch()||isLanding()||isLandhard()||targetanimation==drawrightanim||targetanimation==drawleftanim||targetanimation==crouchdrawrightanim)&&!(wasIdle()||wasCrouch()||wasLanding()||wasLandhard()||currentanimation==drawrightanim||currentanimation==drawleftanim||currentanimation==crouchdrawrightanim))&&!skeleton.free){
XYZ point,newpoint,change,change2;
- point=DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,rotation,0)*scale+coords;
+ point=DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,yaw,0)*scale+coords;
heightleft=terrain.getHeight(point.x,point.z)+.04;
point.y=heightleft;
change=skeleton.joints[skeleton.jointlabels[leftankle]].position-skeleton.joints[skeleton.jointlabels[leftfoot]].position;
change2=skeleton.joints[skeleton.jointlabels[leftknee]].position-skeleton.joints[skeleton.jointlabels[leftfoot]].position;
- skeleton.joints[skeleton.jointlabels[leftfoot]].position=DoRotation((point-coords)/scale,0,-rotation,0)*target+skeleton.joints[skeleton.jointlabels[leftfoot]].position*(1-target);
+ skeleton.joints[skeleton.jointlabels[leftfoot]].position=DoRotation((point-coords)/scale,0,-yaw,0)*target+skeleton.joints[skeleton.jointlabels[leftfoot]].position*(1-target);
skeleton.joints[skeleton.jointlabels[leftankle]].position=skeleton.joints[skeleton.jointlabels[leftfoot]].position+change;
skeleton.joints[skeleton.jointlabels[leftknee]].position=(skeleton.joints[skeleton.jointlabels[leftfoot]].position+change2)/2+(skeleton.joints[skeleton.jointlabels[leftknee]].position)/2;
- point=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,rotation,0)*scale+coords;
+ point=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,yaw,0)*scale+coords;
heightright=terrain.getHeight(point.x,point.z)+.04;
point.y=heightright;
change=skeleton.joints[skeleton.jointlabels[rightankle]].position-skeleton.joints[skeleton.jointlabels[rightfoot]].position;
change2=skeleton.joints[skeleton.jointlabels[rightknee]].position-skeleton.joints[skeleton.jointlabels[rightfoot]].position;
- skeleton.joints[skeleton.jointlabels[rightfoot]].position=DoRotation((point-coords)/scale,0,-rotation,0)*target+skeleton.joints[skeleton.jointlabels[rightfoot]].position*(1-target);
+ skeleton.joints[skeleton.jointlabels[rightfoot]].position=DoRotation((point-coords)/scale,0,-yaw,0)*target+skeleton.joints[skeleton.jointlabels[rightfoot]].position*(1-target);
skeleton.joints[skeleton.jointlabels[rightankle]].position=skeleton.joints[skeleton.jointlabels[rightfoot]].position+change;
skeleton.joints[skeleton.jointlabels[rightknee]].position=(skeleton.joints[skeleton.jointlabels[rightfoot]].position+change2)/2+(skeleton.joints[skeleton.jointlabels[rightknee]].position)/2;
skeleton.DoConstraints(&coords,&scale);
if(creature==wolftype){
- point=DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,rotation,0)*scale+coords;
+ point=DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,yaw,0)*scale+coords;
heightleft=terrain.getHeight(point.x,point.z)+.04;
point.y=heightleft;
change=skeleton.joints[skeleton.jointlabels[leftankle]].position-skeleton.joints[skeleton.jointlabels[leftfoot]].position;
change2=skeleton.joints[skeleton.jointlabels[leftknee]].position-skeleton.joints[skeleton.jointlabels[leftfoot]].position;
- skeleton.joints[skeleton.jointlabels[leftfoot]].position=DoRotation((point-coords)/scale,0,-rotation,0)*target+skeleton.joints[skeleton.jointlabels[leftfoot]].position*(1-target);
+ skeleton.joints[skeleton.jointlabels[leftfoot]].position=DoRotation((point-coords)/scale,0,-yaw,0)*target+skeleton.joints[skeleton.jointlabels[leftfoot]].position*(1-target);
skeleton.joints[skeleton.jointlabels[leftankle]].position=skeleton.joints[skeleton.jointlabels[leftfoot]].position+change;
skeleton.joints[skeleton.jointlabels[leftknee]].position=(skeleton.joints[skeleton.jointlabels[leftfoot]].position+change2)/2+(skeleton.joints[skeleton.jointlabels[leftknee]].position)/2;
- point=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,rotation,0)*scale+coords;
+ point=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,yaw,0)*scale+coords;
heightright=terrain.getHeight(point.x,point.z)+.04;
point.y=heightright;
change=skeleton.joints[skeleton.jointlabels[rightankle]].position-skeleton.joints[skeleton.jointlabels[rightfoot]].position;
change2=skeleton.joints[skeleton.jointlabels[rightknee]].position-skeleton.joints[skeleton.jointlabels[rightfoot]].position;
- skeleton.joints[skeleton.jointlabels[rightfoot]].position=DoRotation((point-coords)/scale,0,-rotation,0)*target+skeleton.joints[skeleton.jointlabels[rightfoot]].position*(1-target);
+ skeleton.joints[skeleton.jointlabels[rightfoot]].position=DoRotation((point-coords)/scale,0,-yaw,0)*target+skeleton.joints[skeleton.jointlabels[rightfoot]].position*(1-target);
skeleton.joints[skeleton.jointlabels[rightankle]].position=skeleton.joints[skeleton.jointlabels[rightfoot]].position+change;
skeleton.joints[skeleton.jointlabels[rightknee]].position=(skeleton.joints[skeleton.jointlabels[rightfoot]].position+change2)/2+(skeleton.joints[skeleton.jointlabels[rightknee]].position)/2;
skeleton.DoConstraints(&coords,&scale);
if(onterrain&&(!(isIdle()||isCrouch()||isLanding()||isLandhard()||targetanimation==drawrightanim||targetanimation==drawleftanim||targetanimation==crouchdrawrightanim)&&(wasIdle()||wasCrouch()||wasLanding()||wasLandhard()||currentanimation==drawrightanim||currentanimation==drawleftanim||currentanimation==crouchdrawrightanim))&&!skeleton.free){
XYZ point,newpoint,change,change2;
- point=DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,rotation,0)*scale+coords;
+ point=DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,yaw,0)*scale+coords;
heightleft=terrain.getHeight(point.x,point.z)+.04;
point.y=heightleft;
change=skeleton.joints[skeleton.jointlabels[leftankle]].position-skeleton.joints[skeleton.jointlabels[leftfoot]].position;
change2=skeleton.joints[skeleton.jointlabels[leftknee]].position-skeleton.joints[skeleton.jointlabels[leftfoot]].position;
- skeleton.joints[skeleton.jointlabels[leftfoot]].position=DoRotation((point-coords)/scale,0,-rotation,0)*(1-target)+skeleton.joints[skeleton.jointlabels[leftfoot]].position*target;
+ skeleton.joints[skeleton.jointlabels[leftfoot]].position=DoRotation((point-coords)/scale,0,-yaw,0)*(1-target)+skeleton.joints[skeleton.jointlabels[leftfoot]].position*target;
skeleton.joints[skeleton.jointlabels[leftankle]].position=skeleton.joints[skeleton.jointlabels[leftfoot]].position+change;
skeleton.joints[skeleton.jointlabels[leftknee]].position=(skeleton.joints[skeleton.jointlabels[leftfoot]].position+change2)/2+(skeleton.joints[skeleton.jointlabels[leftknee]].position)/2;
- point=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,rotation,0)*scale+coords;
+ point=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,yaw,0)*scale+coords;
heightright=terrain.getHeight(point.x,point.z)+.04;
point.y=heightright;
change=skeleton.joints[skeleton.jointlabels[rightankle]].position-skeleton.joints[skeleton.jointlabels[rightfoot]].position;
change2=skeleton.joints[skeleton.jointlabels[rightknee]].position-skeleton.joints[skeleton.jointlabels[rightfoot]].position;
- skeleton.joints[skeleton.jointlabels[rightfoot]].position=DoRotation((point-coords)/scale,0,-rotation,0)*(1-target)+skeleton.joints[skeleton.jointlabels[rightfoot]].position*target;
+ skeleton.joints[skeleton.jointlabels[rightfoot]].position=DoRotation((point-coords)/scale,0,-yaw,0)*(1-target)+skeleton.joints[skeleton.jointlabels[rightfoot]].position*target;
skeleton.joints[skeleton.jointlabels[rightankle]].position=skeleton.joints[skeleton.jointlabels[rightfoot]].position+change;
skeleton.joints[skeleton.jointlabels[rightknee]].position=(skeleton.joints[skeleton.jointlabels[rightfoot]].position+change2)/2+(skeleton.joints[skeleton.jointlabels[rightknee]].position)/2;
skeleton.DoConstraints(&coords,&scale);
if(creature==wolftype){
- point=DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,rotation,0)*scale+coords;
+ point=DoRotation(skeleton.joints[skeleton.jointlabels[leftfoot]].position,0,yaw,0)*scale+coords;
heightleft=terrain.getHeight(point.x,point.z)+.04;
point.y=heightleft;
change=skeleton.joints[skeleton.jointlabels[leftankle]].position-skeleton.joints[skeleton.jointlabels[leftfoot]].position;
change2=skeleton.joints[skeleton.jointlabels[leftknee]].position-skeleton.joints[skeleton.jointlabels[leftfoot]].position;
- skeleton.joints[skeleton.jointlabels[leftfoot]].position=DoRotation((point-coords)/scale,0,-rotation,0)*(1-target)+skeleton.joints[skeleton.jointlabels[leftfoot]].position*target;
+ skeleton.joints[skeleton.jointlabels[leftfoot]].position=DoRotation((point-coords)/scale,0,-yaw,0)*(1-target)+skeleton.joints[skeleton.jointlabels[leftfoot]].position*target;
skeleton.joints[skeleton.jointlabels[leftankle]].position=skeleton.joints[skeleton.jointlabels[leftfoot]].position+change;
skeleton.joints[skeleton.jointlabels[leftknee]].position=(skeleton.joints[skeleton.jointlabels[leftfoot]].position+change2)/2+(skeleton.joints[skeleton.jointlabels[leftknee]].position)/2;
- point=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,rotation,0)*scale+coords;
+ point=DoRotation(skeleton.joints[skeleton.jointlabels[rightfoot]].position,0,yaw,0)*scale+coords;
heightright=terrain.getHeight(point.x,point.z)+.04;
point.y=heightright;
change=skeleton.joints[skeleton.jointlabels[rightankle]].position-skeleton.joints[skeleton.jointlabels[rightfoot]].position;
change2=skeleton.joints[skeleton.jointlabels[rightknee]].position-skeleton.joints[skeleton.jointlabels[rightfoot]].position;
- skeleton.joints[skeleton.jointlabels[rightfoot]].position=DoRotation((point-coords)/scale,0,-rotation,0)*(1-target)+skeleton.joints[skeleton.jointlabels[rightfoot]].position*target;
+ skeleton.joints[skeleton.jointlabels[rightfoot]].position=DoRotation((point-coords)/scale,0,-yaw,0)*(1-target)+skeleton.joints[skeleton.jointlabels[rightfoot]].position*target;
skeleton.joints[skeleton.jointlabels[rightankle]].position=skeleton.joints[skeleton.jointlabels[rightfoot]].position+change;
skeleton.joints[skeleton.jointlabels[rightknee]].position=(skeleton.joints[skeleton.jointlabels[rightfoot]].position+change2)/2+(skeleton.joints[skeleton.jointlabels[rightknee]].position)/2;
skeleton.DoConstraints(&coords,&scale);
if(!skeleton.free&&(!animation[targetanimation].attack&&targetanimation!=getupfrombackanim&&((targetanimation!=rollanim&&!isFlip())||animation[targetanimation].label[targetframe]==6)&&targetanimation!=getupfromfrontanim&&targetanimation!=wolfrunninganim&&targetanimation!=rabbitrunninganim&&targetanimation!=backhandspringanim&&targetanimation!=walljumpfrontanim&&targetanimation!=hurtidleanim&&!isLandhard()&&!isSleeping()))
DoHead();
else {
- targetheadrotation=-targetrotation;
- targetheadrotation2=0;
- if(animation[targetanimation].attack==3)targetheadrotation+=180;
+ targetheadyaw=-targetyaw;
+ targetheadpitch=0;
+ if(animation[targetanimation].attack==3)targetheadyaw+=180;
}
for(i=0;i<skeleton.drawmodel.vertexNum;i++){
skeleton.drawmodel.vertex[i]=0;
if(!skeleton.free)glTranslatef(coords.x,coords.y-.02,coords.z);
if(skeleton.free)glTranslatef(coords.x,coords.y-.02,coords.z);
if(!skeleton.free)glTranslatef(offset.x*scale,offset.y*scale,offset.z*scale);
- if(!skeleton.free)glRotatef(rotation,0,1,0);
+ if(!skeleton.free)glRotatef(yaw,0,1,0);
if(showpoints){
glPointSize(5);
glColor4f(.4,1,.4,1);
for(k=0;k<num_weapons;k++){
i=weaponids[k];
if(weaponactive==k){
- if(weapons.type[i]!=staff){
+ if(weapons[i].getType()!=staff){
for(j=0;j<skeleton.num_muscles;j++){
if((skeleton.muscles[j].parent1->label==righthand||skeleton.muscles[j].parent2->label==righthand)&&skeleton.muscles[j].numvertices>0){
weaponattachmuscle=j;
weaponpoint=(skeleton.muscles[weaponattachmuscle].parent1->position+skeleton.muscles[weaponattachmuscle].parent2->position)/2;
if(creature==wolftype)weaponpoint=(skeleton.joints[skeleton.jointlabels[rightwrist]].position*.7+skeleton.joints[skeleton.jointlabels[righthand]].position*.3);
}
- if(weapons.type[i]==staff){
+ if(weapons[i].getType()==staff){
for(j=0;j<skeleton.num_muscles;j++){
if((skeleton.muscles[j].parent1->label==righthand||skeleton.muscles[j].parent2->label==righthand)&&skeleton.muscles[j].numvertices>0){
weaponattachmuscle=j;
}
}
if(weaponactive!=k&&weaponstuck!=k){
- if(weapons.type[i]==knife)weaponpoint=skeleton.joints[skeleton.jointlabels[abdomen]].position+(skeleton.joints[skeleton.jointlabels[righthip]].position-skeleton.joints[skeleton.jointlabels[lefthip]].position)*.1+(skeleton.joints[skeleton.jointlabels[rightshoulder]].position-skeleton.joints[skeleton.jointlabels[leftshoulder]].position)*.35;
- if(weapons.type[i]==sword)weaponpoint=skeleton.joints[skeleton.jointlabels[abdomen]].position+(skeleton.joints[skeleton.jointlabels[lefthip]].position-skeleton.joints[skeleton.jointlabels[righthip]].position)*.09+(skeleton.joints[skeleton.jointlabels[leftshoulder]].position-skeleton.joints[skeleton.jointlabels[rightshoulder]].position)*.33;
- if(weapons.type[i]==staff)weaponpoint=skeleton.joints[skeleton.jointlabels[abdomen]].position+(skeleton.joints[skeleton.jointlabels[lefthip]].position-skeleton.joints[skeleton.jointlabels[righthip]].position)*.09+(skeleton.joints[skeleton.jointlabels[leftshoulder]].position-skeleton.joints[skeleton.jointlabels[rightshoulder]].position)*.33;
+ if(weapons[i].getType()==knife)weaponpoint=skeleton.joints[skeleton.jointlabels[abdomen]].position+(skeleton.joints[skeleton.jointlabels[righthip]].position-skeleton.joints[skeleton.jointlabels[lefthip]].position)*.1+(skeleton.joints[skeleton.jointlabels[rightshoulder]].position-skeleton.joints[skeleton.jointlabels[leftshoulder]].position)*.35;
+ if(weapons[i].getType()==sword)weaponpoint=skeleton.joints[skeleton.jointlabels[abdomen]].position+(skeleton.joints[skeleton.jointlabels[lefthip]].position-skeleton.joints[skeleton.jointlabels[righthip]].position)*.09+(skeleton.joints[skeleton.jointlabels[leftshoulder]].position-skeleton.joints[skeleton.jointlabels[rightshoulder]].position)*.33;
+ if(weapons[i].getType()==staff)weaponpoint=skeleton.joints[skeleton.jointlabels[abdomen]].position+(skeleton.joints[skeleton.jointlabels[lefthip]].position-skeleton.joints[skeleton.jointlabels[righthip]].position)*.09+(skeleton.joints[skeleton.jointlabels[leftshoulder]].position-skeleton.joints[skeleton.jointlabels[rightshoulder]].position)*.33;
for(j=0;j<skeleton.num_muscles;j++){
if((skeleton.muscles[j].parent1->label==abdomen||skeleton.muscles[j].parent2->label==abdomen)&&(skeleton.muscles[j].parent1->label==neck||skeleton.muscles[j].parent2->label==neck)&&skeleton.muscles[j].numvertices>0){
weaponrotatemuscle=j;
}
}
}
- if(!skeleton.free){
- weapons.position[i]=DoRotation(DoRotation(DoRotation(weaponpoint,0,0,tilt),tilt2,0,0),0,rotation,0)*scale+coords+currentoffset*(1-target)*scale+targetoffset*target*scale;
- weapons.bigrotation[i]=rotation;
- weapons.bigtilt[i]=tilt;
- weapons.bigtilt2[i]=tilt2;
- }
if(skeleton.free){
- weapons.position[i]=weaponpoint*scale+coords;
- weapons.bigrotation[i]=0;
- weapons.bigtilt[i]=0;
- weapons.bigtilt2[i]=0;
+ weapons[i].position=weaponpoint*scale+coords;
+ weapons[i].bigrotation=0;
+ weapons[i].bigtilt=0;
+ weapons[i].bigtilt2=0;
+ } else {
+ weapons[i].position=DoRotation(DoRotation(DoRotation(weaponpoint,0,0,tilt),tilt2,0,0),0,yaw,0)*scale+coords+currentoffset*(1-target)*scale+targetoffset*target*scale;
+ weapons[i].bigrotation=yaw;
+ weapons[i].bigtilt=tilt;
+ weapons[i].bigtilt2=tilt2;
}
- weapons.rotation1[i]=skeleton.muscles[weaponrotatemuscle].lastrotate1;
- weapons.rotation2[i]=skeleton.muscles[weaponrotatemuscle].lastrotate2;
- weapons.rotation3[i]=skeleton.muscles[weaponrotatemuscle].lastrotate3;
+ weapons[i].rotation1=skeleton.muscles[weaponrotatemuscle].lastrotate1;
+ weapons[i].rotation2=skeleton.muscles[weaponrotatemuscle].lastrotate2;
+ weapons[i].rotation3=skeleton.muscles[weaponrotatemuscle].lastrotate3;
if(weaponactive==k){
- if(weapons.type[i]==knife){
- weapons.smallrotation[i]=180;
- weapons.smallrotation2[i]=0;
+ if(weapons[i].getType()==knife){
+ weapons[i].smallrotation=180;
+ weapons[i].smallrotation2=0;
if(isCrouch()||wasCrouch()){
- weapons.smallrotation2[i]=20;
+ weapons[i].smallrotation2=20;
}
if(targetanimation==hurtidleanim){
- weapons.smallrotation2[i]=50;
+ weapons[i].smallrotation2=50;
}
if((currentanimation==crouchstabanim&&targetanimation==crouchstabanim)||(currentanimation==backhandspringanim&&targetanimation==backhandspringanim)){
XYZ temppoint1,temppoint2,tempforward;
temppoint1=skeleton.joints[skeleton.jointlabels[righthand]].position;
temppoint2=animation[currentanimation].weapontarget[currentframe]*(1-target)+animation[targetanimation].weapontarget[targetframe]*(target);
distance=findDistance(&temppoint1,&temppoint2);
- weapons.rotation2[i]=asin((temppoint1.y-temppoint2.y)/distance);
- weapons.rotation2[i]*=360/6.28;
+ weapons[i].rotation2=asin((temppoint1.y-temppoint2.y)/distance);
+ weapons[i].rotation2*=360/6.28;
temppoint1.y=0;
temppoint2.y=0;
- weapons.rotation1[i]=acos((temppoint1.z-temppoint2.z)/findDistance(&temppoint1,&temppoint2));
- weapons.rotation1[i]*=360/6.28;
- weapons.rotation3[i]=0;
- weapons.smallrotation[i]=-90;
- weapons.smallrotation2[i]=0;
- if(temppoint1.x>temppoint2.x)weapons.rotation1[i]=360-weapons.rotation1[i];
+ weapons[i].rotation1=acos((temppoint1.z-temppoint2.z)/findDistance(&temppoint1,&temppoint2));
+ weapons[i].rotation1*=360/6.28;
+ weapons[i].rotation3=0;
+ weapons[i].smallrotation=-90;
+ weapons[i].smallrotation2=0;
+ if(temppoint1.x>temppoint2.x)weapons[i].rotation1=360-weapons[i].rotation1;
}
if((currentanimation==knifeslashreversalanim&&targetanimation==knifeslashreversalanim)||(currentanimation==knifeslashreversedanim&&targetanimation==knifeslashreversedanim)){
XYZ temppoint1,temppoint2,tempforward;
temppoint1=skeleton.joints[skeleton.jointlabels[righthand]].position;
temppoint2=animation[currentanimation].weapontarget[currentframe]*(1-target)+animation[targetanimation].weapontarget[targetframe]*(target);
distance=findDistance(&temppoint1,&temppoint2);
- weapons.rotation2[i]=asin((temppoint1.y-temppoint2.y)/distance);
- weapons.rotation2[i]*=360/6.28;
+ weapons[i].rotation2=asin((temppoint1.y-temppoint2.y)/distance);
+ weapons[i].rotation2*=360/6.28;
temppoint1.y=0;
temppoint2.y=0;
- weapons.rotation1[i]=acos((temppoint1.z-temppoint2.z)/findDistance(&temppoint1,&temppoint2));
- weapons.rotation1[i]*=360/6.28;
- weapons.rotation3[i]=0;
- weapons.smallrotation[i]=90;
- weapons.smallrotation2[i]=0;
- if(temppoint1.x>temppoint2.x)weapons.rotation1[i]=360-weapons.rotation1[i];
+ weapons[i].rotation1=acos((temppoint1.z-temppoint2.z)/findDistance(&temppoint1,&temppoint2));
+ weapons[i].rotation1*=360/6.28;
+ weapons[i].rotation3=0;
+ weapons[i].smallrotation=90;
+ weapons[i].smallrotation2=0;
+ if(temppoint1.x>temppoint2.x)weapons[i].rotation1=360-weapons[i].rotation1;
}
if(targetanimation==knifethrowanim){
- weapons.smallrotation[i]=90;
- //weapons.smallrotation2[i]=-90;
- weapons.smallrotation2[i]=0;
- weapons.rotation1[i]=0;
- weapons.rotation2[i]=0;
- weapons.rotation3[i]=0;
+ weapons[i].smallrotation=90;
+ //weapons[i].smallrotation2=-90;
+ weapons[i].smallrotation2=0;
+ weapons[i].rotation1=0;
+ weapons[i].rotation2=0;
+ weapons[i].rotation3=0;
}
if(targetanimation==knifesneakattackanim&&targetframe<5){
- weapons.smallrotation[i]=-90;
- weapons.rotation1[i]=0;
- weapons.rotation2[i]=0;
- weapons.rotation3[i]=0;
+ weapons[i].smallrotation=-90;
+ weapons[i].rotation1=0;
+ weapons[i].rotation2=0;
+ weapons[i].rotation3=0;
}
}
- if(weapons.type[i]==sword){
- weapons.smallrotation[i]=0;
- weapons.smallrotation2[i]=0;
+ if(weapons[i].getType()==sword){
+ weapons[i].smallrotation=0;
+ weapons[i].smallrotation2=0;
if(targetanimation==knifethrowanim){
- weapons.smallrotation[i]=-90;
- weapons.smallrotation2[i]=0;
- weapons.rotation1[i]=0;
- weapons.rotation2[i]=0;
- weapons.rotation3[i]=0;
+ weapons[i].smallrotation=-90;
+ weapons[i].smallrotation2=0;
+ weapons[i].rotation1=0;
+ weapons[i].rotation2=0;
+ weapons[i].rotation3=0;
}
if((targetanimation==swordgroundstabanim&¤tanimation==swordgroundstabanim)||(targetanimation==swordsneakattackanim&¤tanimation==swordsneakattackanim)||(targetanimation==swordslashparryanim&¤tanimation==swordslashparryanim)||(targetanimation==swordslashparriedanim&¤tanimation==swordslashparriedanim)||(targetanimation==swordslashreversalanim&¤tanimation==swordslashreversalanim)||(targetanimation==swordslashreversedanim&¤tanimation==swordslashreversedanim)||(targetanimation==knifeslashreversalanim&¤tanimation==knifeslashreversalanim)||(targetanimation==knifeslashreversedanim&¤tanimation==knifeslashreversedanim)||(targetanimation==swordslashanim&¤tanimation==swordslashanim)||(targetanimation==drawleftanim&¤tanimation==drawleftanim)||(currentanimation==backhandspringanim&&targetanimation==backhandspringanim)){
XYZ temppoint1,temppoint2,tempforward;
temppoint1=animation[currentanimation].position[skeleton.jointlabels[righthand]][currentframe]*(1-target)+animation[targetanimation].position[skeleton.jointlabels[righthand]][targetframe]*(target); //skeleton.joints[skeleton.jointlabels[righthand]].position;
temppoint2=animation[currentanimation].weapontarget[currentframe]*(1-target)+animation[targetanimation].weapontarget[targetframe]*(target);
distance=findDistance(&temppoint1,&temppoint2);
- weapons.rotation2[i]=asin((temppoint1.y-temppoint2.y)/distance);
- weapons.rotation2[i]*=360/6.28;
+ weapons[i].rotation2=asin((temppoint1.y-temppoint2.y)/distance);
+ weapons[i].rotation2*=360/6.28;
temppoint1.y=0;
temppoint2.y=0;
- weapons.rotation1[i]=acos((temppoint1.z-temppoint2.z)/findDistance(&temppoint1,&temppoint2));
- weapons.rotation1[i]*=360/6.28;
- weapons.rotation3[i]=0;
- weapons.smallrotation[i]=90;
- weapons.smallrotation2[i]=0;
- if(temppoint1.x>temppoint2.x)weapons.rotation1[i]=360-weapons.rotation1[i];
+ weapons[i].rotation1=acos((temppoint1.z-temppoint2.z)/findDistance(&temppoint1,&temppoint2));
+ weapons[i].rotation1*=360/6.28;
+ weapons[i].rotation3=0;
+ weapons[i].smallrotation=90;
+ weapons[i].smallrotation2=0;
+ if(temppoint1.x>temppoint2.x)weapons[i].rotation1=360-weapons[i].rotation1;
}
}
- if(weapons.type[i]==staff){
- weapons.smallrotation[i]=100;
- weapons.smallrotation2[i]=0;
+ if(weapons[i].getType()==staff){
+ weapons[i].smallrotation=100;
+ weapons[i].smallrotation2=0;
if((targetanimation==staffhitanim&¤tanimation==staffhitanim)||(targetanimation==staffhitreversedanim&¤tanimation==staffhitreversedanim)||(targetanimation==staffspinhitreversedanim&¤tanimation==staffspinhitreversedanim)||(targetanimation==staffgroundsmashanim&¤tanimation==staffgroundsmashanim)||(targetanimation==staffspinhitanim&¤tanimation==staffspinhitanim)){
XYZ temppoint1,temppoint2,tempforward;
float distance;
temppoint1=animation[currentanimation].position[skeleton.jointlabels[righthand]][currentframe]*(1-target)+animation[targetanimation].position[skeleton.jointlabels[righthand]][targetframe]*(target); //skeleton.joints[skeleton.jointlabels[righthand]].position;
temppoint2=animation[currentanimation].weapontarget[currentframe]*(1-target)+animation[targetanimation].weapontarget[targetframe]*(target);
distance=findDistance(&temppoint1,&temppoint2);
- weapons.rotation2[i]=asin((temppoint1.y-temppoint2.y)/distance);
- weapons.rotation2[i]*=360/6.28;
+ weapons[i].rotation2=asin((temppoint1.y-temppoint2.y)/distance);
+ weapons[i].rotation2*=360/6.28;
temppoint1.y=0;
temppoint2.y=0;
- weapons.rotation1[i]=acos((temppoint1.z-temppoint2.z)/findDistance(&temppoint1,&temppoint2));
- weapons.rotation1[i]*=360/6.28;
- weapons.rotation3[i]=0;
- weapons.smallrotation[i]=90;
- weapons.smallrotation2[i]=0;
- if(temppoint1.x>temppoint2.x)weapons.rotation1[i]=360-weapons.rotation1[i];
+ weapons[i].rotation1=acos((temppoint1.z-temppoint2.z)/findDistance(&temppoint1,&temppoint2));
+ weapons[i].rotation1*=360/6.28;
+ weapons[i].rotation3=0;
+ weapons[i].smallrotation=90;
+ weapons[i].smallrotation2=0;
+ if(temppoint1.x>temppoint2.x)weapons[i].rotation1=360-weapons[i].rotation1;
}
}
}
if(weaponactive!=k&&weaponstuck!=k){
- if(weapons.type[i]==knife){
- weapons.smallrotation[i]=-70;
- weapons.smallrotation2[i]=10;
+ if(weapons[i].getType()==knife){
+ weapons[i].smallrotation=-70;
+ weapons[i].smallrotation2=10;
}
- if(weapons.type[i]==sword){
- weapons.smallrotation[i]=-100;
- weapons.smallrotation2[i]=-8;
+ if(weapons[i].getType()==sword){
+ weapons[i].smallrotation=-100;
+ weapons[i].smallrotation2=-8;
}
- if(weapons.type[i]==staff){
- weapons.smallrotation[i]=-100;
- weapons.smallrotation2[i]=-8;
+ if(weapons[i].getType()==staff){
+ weapons[i].smallrotation=-100;
+ weapons[i].smallrotation2=-8;
}
}
if(weaponstuck==k){
- if(weaponstuckwhere==0)weapons.smallrotation[i]=180;
- else weapons.smallrotation[i]=0;
- weapons.smallrotation2[i]=10;
+ if(weaponstuckwhere==0)
+ weapons[i].smallrotation=180;
+ else
+ weapons[i].smallrotation=0;
+ weapons[i].smallrotation2=10;
}
}
}
projects / lugaru.git / blobdiff