]> git.jsancho.org Git - lugaru.git/blobdiff - Source/Person.cpp
major refactor of texture system
[lugaru.git] / Source / Person.cpp
index 936235864341e7c1426aa34d64ae5aa89160456a..87a4bbe952169d8071309255f4847fe9ab399da5 100644 (file)
@@ -10,7 +10,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -21,15 +21,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 /**> HEADER FILES <**/
 #include "Person.h"
+#include "openal_wrapper.h"
+#include "Animation.h"
+#include "Sounds.h"
+#include "Awards.h"
+#include "Game.h"
 
 extern float multiplier;
-extern Animation animation[animation_count];
-extern FSOUND_SAMPLE   *samp[100];
-extern int channels[100];
 extern Terrain terrain;
 extern float gravity;
 extern int environment;
-extern Sprites sprites;
 extern int detail;
 extern FRUSTUM frustum;
 extern XYZ viewer;
@@ -47,15 +48,11 @@ extern bool osx;
 extern bool autoslomo;
 extern float camerashake;
 extern float woozy;
-extern float terraindetail;
 extern float viewdistance;
 extern float blackout;
 extern int difficulty;
-extern Weapons weapons;
 extern bool decals;
 extern float fadestart;
-extern Person player[maxplayers];
-extern int numplayers;
 extern bool freeze;
 extern bool winfreeze;
 extern float flashamount,flashr,flashg,flashb;
@@ -68,15 +65,10 @@ extern bool tiltweird;
 extern bool midweird;
 extern bool proportionweird;
 extern bool vertexweird[6];
-extern GLubyte texturearray[512*512*3];
 extern XYZ envsound[30];
 extern float envsoundvol[30];
 extern float envsoundlife[30];
 extern int numenvsounds;
-extern int bonus;
-extern float bonusvalue;
-extern float bonustotal;
-extern float bonustime;
 extern int tutoriallevel;
 extern float smoketex;
 extern int tutorialstage;
@@ -84,112 +76,74 @@ extern bool reversaltrain;
 extern bool canattack;
 extern bool cananger;
 extern float damagedealt;
-extern float damagetaken;
 extern int hostile;
 extern float hostiletime;
 
-extern int mainmenu;
-
-extern int numfalls;
-extern int numflipfail;
-extern int numseen;
-extern int numswordattack;
-extern int numknifeattack;
-extern int numunarmedattack;
-extern int numescaped;
-extern int numflipped;
-extern int numwallflipped;
-extern int numthrowkill;
-extern int numafterkill;
-extern int numreversals;
-extern int numattacks;
-extern int maxalarmed;
 extern int indialogue;
 
 extern bool gamestarted;
 
-extern FSOUND_STREAM * strm[20];
-extern "C"     void PlaySoundEx(int channel, FSOUND_SAMPLE *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused);
-extern "C" void PlayStreamEx(int chan, FSOUND_STREAM *sptr, FSOUND_DSPUNIT *dsp, signed char startpaused);
-
-void Person::CheckKick(){
-       static XYZ relative;
-       static int i;
-
-       float damagemult=1*power;
-       if(creature==wolftype)damagemult=2.5*power;
-       damagemult*=power;
-
-       if(hasvictim)
-               if(targetanimation==rabbitkickanim&&victim&&victim!=this&&currentframe>=2&&currentanimation==rabbitkickanim){
-                       if(findDistancefast(&coords,&victim->coords)<1.2){
-                               if(!victim->skeleton.free){
-                                       relative=velocity;
-                                       Normalise(&relative);
-                                       relative=coords+relative*1;
-                                       if(animation[victim->targetanimation].height!=lowheight){
-                                               victim->spurt=1;
-                                               DoBlood(.2,250);
-                                               float gLoc[3];
-                                               float vel[3];
-                                               gLoc[0]=victim->coords.x;
-                                               gLoc[1]=victim->coords.y;
-                                               gLoc[2]=victim->coords.z;
-                                               vel[0]=velocity.x;
-                                               vel[1]=velocity.y;
-                                               vel[2]=velocity.z;
-                                               if(tutoriallevel!=1){
-                                                       PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, TRUE);
-                                                       FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel);
-                                                       FSOUND_SetVolume(channels[heavyimpactsound], 128);
-                                                       FSOUND_SetPaused(channels[heavyimpactsound], FALSE);
-                                               }
-                                               victim->RagDoll(0);
-                                               relative=velocity;
-                                               relative.y=0;
-                                               Normalise(&relative);
-                                               for(i=0;i<victim->skeleton.num_joints;i++){
-                                                       victim->skeleton.joints[i].velocity+=relative*120*damagemult;
-                                               }
-                                               victim->Puff(neck);
-                                               victim->DoDamage(100*damagemult/victim->protectionhigh);
-                                               if(id==0)camerashake+=.4;
+Person player[maxplayers];
 
-                                               target=0;
-                                               currentframe=3;
-                                               targetanimation=backflipanim;
-                                               targetframe=4;
-                                               velocity=facing*-10;
-                                               velocity.y=5;
-                                               skeleton.free=0;
-                                               if(id==0)FSOUND_SetPaused(channels[whooshsound], FALSE);
-
-                                               //if(victim->damage>victim->damagetolerance){
-                                               if(id==0){
-                                                       bonus=cannon;
-                                                       bonustime=0;
-                                                       bonusvalue=100;
-                                               }
-                                               //}
-                                       }
-                                       else if (victim->isCrouch()){
-                                               targetanimation=rabbitkickreversedanim;
-                                               currentanimation=rabbitkickreversedanim;
-                                               victim->currentanimation=rabbitkickreversalanim;
-                                               victim->targetanimation=rabbitkickreversalanim;
-                                               targettilt2=0;
-                                               currentframe=0;
-                                               targetframe=1;
-                                               target=0;
-                                               velocity=0;
-                                               victim->oldcoords=victim->coords;
-                                               coords=victim->coords;
-                                               victim->targetrotation=targetrotation;
-                                               victim->victim=this;
-                                       }
-                               }
-                       }
-               }
+void Person::CheckKick()
+{
+  if (!(hasvictim
+       && (targetanimation == rabbitkickanim
+           && victim
+           && victim != this
+           && currentframe >= 2
+           && currentanimation == rabbitkickanim)
+       && (findDistancefast(&coords,&victim->coords) < 1.2)
+       && (!victim->skeleton.free)))
+    return;
+
+  if (animation[victim->targetanimation].height!=lowheight)
+    {
+      float damagemult = (creature == wolftype ? 2.5 : 1.) * power * power;
+      XYZ relative = velocity;
+      relative.y=0;
+      Normalise(&relative);
+
+      victim->spurt=1;
+      DoBlood(.2,250);
+      if(tutoriallevel!=1)
+       emit_sound_at(heavyimpactsound, victim->coords);
+      victim->RagDoll(0);
+      for(int i=0;i<victim->skeleton.num_joints;i++){
+       victim->skeleton.joints[i].velocity+=relative*120*damagemult;
+      }
+      victim->Puff(neck);
+      victim->DoDamage(100*damagemult/victim->protectionhigh);
+      if(id==0)camerashake+=.4;
+
+      target=0;
+      currentframe=3;
+      targetanimation=backflipanim;
+      targetframe=4;
+      velocity=facing*-10;
+      velocity.y=5;
+      skeleton.free=0;
+      if(id==0)
+       resume_stream(whooshsound);
+
+      award_bonus(id, cannon);
+    }
+  else if (victim->isCrouch())
+    {
+      targetanimation=rabbitkickreversedanim;
+      currentanimation=rabbitkickreversedanim;
+      victim->currentanimation=rabbitkickreversalanim;
+      victim->targetanimation=rabbitkickreversalanim;
+      targettilt2=0;
+      currentframe=0;
+      targetframe=1;
+      target=0;
+      velocity=0;
+      victim->oldcoords=victim->coords;
+      coords=victim->coords;
+      victim->targetyaw=targetyaw;
+      victim->victim=this;
+    }
 }
 
 void Person::CatchFire(){
@@ -199,64 +153,22 @@ void Person::CatchFire(){
                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;
-               sprites.MakeSprite(flamesprite, flatfacing,flatvelocity, 1,1,1, 2, 1);
+               Sprite::MakeSprite(flamesprite, flatfacing,flatvelocity, 1,1,1, 2, 1);
        }
 
        onfiredelay=0.5;
 
-       float gLoc[3];
-       float vel[3];
-       gLoc[0]=coords.x;
-       gLoc[1]=coords.y;
-       gLoc[2]=coords.z;
-       vel[0]=0;
-       vel[1]=0;
-       vel[2]=0;
-       PlaySoundEx( firestartsound, samp[firestartsound], NULL, TRUE);
-       FSOUND_3D_SetAttributes(channels[firestartsound], gLoc, vel);
-       FSOUND_SetVolume(channels[firestartsound], 256);
-       FSOUND_SetPaused(channels[firestartsound], FALSE);
-
-       vel[0]=velocity.x;
-       vel[1]=velocity.y;
-       vel[2]=velocity.z;
-       //PlaySoundEx( firesound, samp[firesound], NULL, TRUE);
-       PlayStreamEx( stream_firesound, strm[stream_firesound], NULL, TRUE);
-       FSOUND_3D_SetAttributes(channels[stream_firesound], gLoc, vel);
-       FSOUND_SetVolume(channels[stream_firesound], 256);
-       FSOUND_SetPaused(channels[stream_firesound], FALSE);
+       emit_sound_at(firestartsound, coords);
+
+       emit_stream_at(stream_firesound, coords);
 
        flamedelay=0;
 
        onfire=1;
 }
 
-bool Person::isIdle(){
-       if(targetanimation==sleepanim||targetanimation==sitanim||targetanimation==talkidleanim||targetanimation==hurtidleanim||targetanimation==bounceidleanim||targetanimation==talkidleanim||targetanimation==fightidleanim||targetanimation==knifefightidleanim||targetanimation==swordfightidleanim||targetanimation==swordfightidlebothanim||targetanimation==fightsidestep||targetanimation==wolfidle)return 1;
-       else return 0;
-}
-
-bool Person::isSitting(){
-       if(targetanimation==sitanim)return 1;
-       if(targetanimation==sitwallanim)return 1;
-       else return 0;
-}
-
-bool Person::isSleeping(){
-       if(targetanimation==sleepanim)return 1;
-       if(targetanimation==dead1anim)return 1;
-       if(targetanimation==dead2anim)return 1;
-       if(targetanimation==dead3anim)return 1;
-       if(targetanimation==dead4anim)return 1;
-       else return 0;
-}
-
-bool Person::wasIdle(){
-       if(currentanimation==sleepanim||currentanimation==talkidleanim||currentanimation==sitanim||currentanimation==hurtidleanim||currentanimation==bounceidleanim||currentanimation==fightidleanim||currentanimation==swordfightidleanim||currentanimation==swordfightidlebothanim||currentanimation==knifefightidleanim||currentanimation==fightsidestep||currentanimation==wolfidle)return 1;
-       else return 0;
-}
 int Person::getIdle(){
        if(indialogue!=-1&&howactive==typeactive&&creature==rabbittype)return talkidleanim;
        if(hasvictim&&victim!=this/*||(id==0&&attackkeydown)*/)if(/*(id==0&&attackkeydown)||*/(!victim->dead&&victim->aitype!=passivetype&&victim->aitype!=searchtype&&aitype!=passivetype&&aitype!=searchtype&&victim->id<numplayers)){
@@ -265,10 +177,14 @@ int Person::getIdle(){
                        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;
        }
@@ -285,32 +201,12 @@ int Person::getIdle(){
        return 0;
 }
 
-bool Person::isCrouch(){
-       if(targetanimation==crouchanim||targetanimation==wolfcrouchanim)return 1;
-       else return 0;
-}
-
-
-bool Person::wasCrouch(){
-       if(currentanimation==crouchanim||currentanimation==wolfcrouchanim)return 1;
-       else return 0;
-}
 int Person::getCrouch(){
        if(creature==rabbittype)return crouchanim;
        if(creature==wolftype)return wolfcrouchanim;
        return 0;
 }
 
-bool Person::isRun(){
-       if(targetanimation==runanim||targetanimation==wolfrunanim||targetanimation==wolfrunninganim||targetanimation==rabbitrunninganim)return 1;
-       else return 0;
-}
-
-
-bool Person::wasRun(){
-       if(currentanimation==runanim||currentanimation==wolfrunanim||currentanimation==wolfrunninganim||currentanimation==rabbitrunninganim)return 1;
-       else return 0;
-}
 int Person::getRun(){
        if(creature==rabbittype&&(!superruntoggle||weaponactive!=-1))return runanim;
        if(creature==wolftype&&(!superruntoggle))return wolfrunanim;
@@ -320,99 +216,31 @@ int Person::getRun(){
        return 0;
 }
 
-bool Person::isStop(){
-       if(targetanimation==stopanim||targetanimation==wolfstopanim)return 1;
-       else return 0;
-}
-
-
-bool Person::wasStop(){
-       if(currentanimation==stopanim||currentanimation==wolfstopanim)return 1;
-       else return 0;
-}
 int Person::getStop(){
        if(creature==rabbittype)return stopanim;
        if(creature==wolftype)return wolfstopanim;
        return 0;
 }
 
-
-bool Person::isLanding(){
-       if(targetanimation==landanim||targetanimation==wolflandanim)return 1;
-       else return 0;
-}
-
-
-bool Person::wasLanding(){
-       if(currentanimation==landanim||currentanimation==wolflandanim)return 1;
-       else return 0;
-}
 int Person::getLanding(){
        if(creature==rabbittype)return landanim;
        if(creature==wolftype)return wolflandanim;
        return 0;
 }
 
-
-bool Person::isLandhard(){
-       if(targetanimation==landhardanim||targetanimation==wolflandhardanim)return 1;
-       else return 0;
-}
-
-
-bool Person::wasLandhard(){
-       if(currentanimation==landhardanim||currentanimation==wolflandhardanim)return 1;
-       else return 0;
-}
 int Person::getLandhard(){
        if(creature==rabbittype)return landhardanim;
        if(creature==wolftype)return wolflandhardanim;
        return 0;
 }
 
-
-bool Person::isFlip(){
-       if(targetanimation==flipanim||targetanimation==frontflipanim||targetanimation==backflipanim||targetanimation==rightflipanim||targetanimation==leftflipanim||targetanimation==walljumprightkickanim||targetanimation==walljumpleftkickanim)return 1;
-       else return 0;
-}
-
-bool Person::wasFlip(){
-       if(currentanimation==flipanim||currentanimation==frontflipanim||currentanimation==backflipanim||currentanimation==rightflipanim||currentanimation==leftflipanim||currentanimation==walljumprightkickanim||currentanimation==walljumpleftkickanim)return 1;
-       else return 0;
-}
-
-bool Person::isWallJump(){
-       if(targetanimation==walljumpfrontanim||targetanimation==walljumpbackanim||targetanimation==walljumpleftanim||targetanimation==walljumprightanim)return 1;
-       else return 0;
-}
-
-void SolidHitBonus();
-void SolidHitBonus(){
-       if(bonustime<1.5&&(bonus==fourxcombo||bonus==megacombo)){
-               bonus=megacombo;
-               bonustime=0;
-               bonusvalue=160;
-       }
-       else if(bonustime<1.5&&bonus==threexcombo){
-               bonus=fourxcombo;
-               bonustime=0;
-               bonusvalue=80;
-       }
-       else if(bonustime<1.5&&bonus==twoxcombo){
-               bonus=threexcombo;
-               bonustime=0;
-               bonusvalue=40;
-       }
-       else if(bonustime<1.5&&bonus==solidhit){
-               bonus=twoxcombo;
-               bonustime=0;
-               bonusvalue=20;
-       }
-       else {
-               bonus=solidhit;
-               bonustime=0;
-               bonusvalue=10;
-       }
+static void
+SolidHitBonus(int playerid)
+{
+  if (bonustime < 1.5 && bonus >= solidhit && bonus <= megacombo)
+    award_bonus(playerid, bonus == megacombo ? bonus : bonus + 1);
+  else
+    award_bonus(playerid, solidhit);
 }
 
 void Person::DoBlood(float howmuch,int which){
@@ -426,44 +254,41 @@ void Person::DoBlood(float howmuch,int which){
                                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){
-                                       sprites.MakeSprite(bloodsprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .05, 1);
-                                       sprites.MakeSprite(bloodflamesprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .3, 1);
+                                       Sprite::MakeSprite(bloodsprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .05, 1);
+                                       Sprite::MakeSprite(bloodflamesprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .3, 1);
                                }
                                if(!skeleton.free){
-                                       sprites.MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1);
-                                       sprites.MakeSprite(bloodflamesprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .3, 1);
-                               }               
+                                       Sprite::MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,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)
                                for(int i=0;i<3;i++){
                                        if(Random()%2!=0){
                                                bloodvel=0;
-                                               if(!skeleton.free){
-                                                       bloodvel.z=10;
-                                                       bloodvel=DoRotation(bloodvel,((float)(Random()%100))/4,rotation+((float)(Random()%100))/4,0)*scale;
-                                               }
-                                               if(skeleton.free){
+                                               if(skeleton.free) {
                                                        bloodvel-=DoRotation(skeleton.forward*10*scale,((float)(Random()%100))/4,((float)(Random()%100))/4,0);
+                                                       bloodvel+=DoRotation(skeleton.joints[skeleton.jointlabels[head]].velocity,((float)(Random()%100))/4,yaw+((float)(Random()%100))/4,0)*scale;
+                                               } else {
+                                                       bloodvel.z=10;
+                                                       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;
                                                }
-                                               if(skeleton.free)bloodvel+=DoRotation(skeleton.joints[skeleton.jointlabels[head]].velocity,((float)(Random()%100))/4,rotation+((float)(Random()%100))/4,0)*scale;
-                                               if(!skeleton.free)bloodvel+=DoRotation(velocity,((float)(Random()%100))/4,((float)(Random()%100))/4,0)*scale;
                                                bloodvel*=.2;
                                                if(skeleton.free){
-                                                       sprites.MakeSprite(splintersprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .05, 1);
-                                                       sprites.special[sprites.numsprites-1]=3;
-                                               }
-                                               if(!skeleton.free){
-                                                       sprites.MakeSprite(splintersprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1);
-                                                       sprites.special[sprites.numsprites-1]=3;
+                                                       Sprite::MakeSprite(splintersprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .05, 1);
+                                               } else {
+                                                       Sprite::MakeSprite(splintersprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,yaw,0)*scale+coords,bloodvel, 1,1,1, .05, 1);
                                                }
+                                               Sprite::setLastSpriteSpecial(3);
                                        }
                                }
                }
@@ -471,22 +296,21 @@ void Person::DoBlood(float howmuch,int which){
                        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);
                                        bleedyint=abs(Random()%512);
                                }
-                               if(creature==wolftype)
-                                       while(wolfbloodText[bleedxint*512*3+bleedyint*3+0]>which+4||wolfbloodText[bleedxint*512*3+bleedyint*3+0]<which-4||bleedxint<10||bleedyint<10||bleedxint>500||bleedyint>500){
-                                               bleedxint=abs(Random()%512);
-                                               bleedyint=abs(Random()%512);
-                                       }
-                                       bleedy=bleedxint;
-                                       bleedx=bleedyint;
-                                       bleedy/=realtexdetail;
-                                       bleedx/=realtexdetail;
-                                       direction=abs(Random()%2)*2-1;
+                       if(creature==wolftype)
+                               while(wolfbloodText[bleedxint*512*3+bleedyint*3+0]>which+4||wolfbloodText[bleedxint*512*3+bleedyint*3+0]<which-4||bleedxint<10||bleedyint<10||bleedxint>500||bleedyint>500){
+                                       bleedxint=abs(Random()%512);
+                                       bleedyint=abs(Random()%512);
+                               }
+                       bleedy=bleedxint;
+                       bleedx=bleedyint;
+                       bleedy/=realtexdetail;
+                       bleedx/=realtexdetail;
+                       direction=abs(Random()%2)*2-1;
                }
 
        }
@@ -501,14 +325,6 @@ void Person::DoBloodBig(float howmuch,int which){
        if(tutoriallevel!=1||id==0)
                if(aitype!=playercontrolled&&howmuch>0){
                        int whichsound=-1;
-                       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(creature==wolftype){
                                int i=abs(Random()%2);
@@ -530,12 +346,8 @@ void Person::DoBloodBig(float howmuch,int which){
                                //if(i==2)whichsound=rabbitpain2sound;
                        }
 
-                       if(whichsound!=-1){
-                               PlaySoundEx( whichsound, samp[whichsound], NULL, TRUE);
-                               FSOUND_3D_SetAttributes(channels[whichsound], gLoc, vel);
-                               FSOUND_SetVolume(channels[whichsound], 512);
-                               FSOUND_SetPaused(channels[whichsound], FALSE);
-                       }
+                       if(whichsound!=-1)
+                         emit_sound_at(whichsound, coords);
                }
 
                if(id==0&&howmuch>0){
@@ -553,21 +365,21 @@ void Person::DoBloodBig(float howmuch,int which){
                                        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){
-                                               sprites.MakeSprite(bloodsprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .05, 1);
-                                               sprites.MakeSprite(bloodflamesprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .3, 1);
+                                               Sprite::MakeSprite(bloodsprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .05, 1);
+                                               Sprite::MakeSprite(bloodflamesprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .3, 1);
                                        }
                                        if(!skeleton.free){
-                                               sprites.MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1);
-                                               sprites.MakeSprite(bloodflamesprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .3, 1);
-                                       }       
+                                               Sprite::MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,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);
+                                       }
                                }
                        }
                        int offsetx=0,offsety=0;
@@ -588,9 +400,7 @@ void Person::DoBloodBig(float howmuch,int which){
                                offsetx=Random()%20;
                        }
                        if(which==220||which==215){
-                               //offsety=Random()%20;
                                offsetx=20;
-                               //offsetx=abs(Random()%80);
                        }
 
 
@@ -608,7 +418,7 @@ void Person::DoBloodBig(float howmuch,int which){
                                                        if(i>endx)endx=i;
                                                        if(j>endy)endy=j;
                                                }
-                                       }       
+                                       }
                                }
                                if(creature==wolftype)
                                        for(i=0;i<512;i++){
@@ -619,7 +429,7 @@ void Person::DoBloodBig(float howmuch,int which){
                                                                if(i>endx)endx=i;
                                                                if(j>endy)endy=j;
                                                        }
-                                               }       
+                                               }
                                        }
 
                                        startx+=offsetx;
@@ -665,9 +475,8 @@ void Person::DoBloodBig(float howmuch,int which){
                                                                        }
                                                                }
                                                        }
-                                                       glBindTexture(GL_TEXTURE_2D,skeleton.drawmodel.textureptr);
-                                                       if(detail!=2||osx)DoMipmaps(5,0,0,skeleton.skinsize,skeleton.skinsize);
-                                                       else DoMipmaps(0,startx/realtexdetail,endx/realtexdetail,starty/realtexdetail,endy/realtexdetail);
+                                                       skeleton.drawmodel.textureptr.bind();
+                                                       DoMipmaps();
 
                                                        bleedxint=0;
                                                        bleedyint=0;
@@ -697,7 +506,7 @@ void Person::DoBloodBig(float howmuch,int which){
                bloodloss+=bleeding*3;
 
                if(tutoriallevel!=1&&aitype!=playercontrolled&&bloodloss>damagetolerance*2/3&&bloodloss<damagetolerance&&creature==rabbittype){
-                       if(abs(Random()%2)==0){aitype=gethelptype; 
+                       if(abs(Random()%2)==0){aitype=gethelptype;
                        lastseentime=12;
                        }
                        else aitype=attacktypecutoff;
@@ -707,7 +516,7 @@ void Person::DoBloodBig(float howmuch,int which){
 }
 
 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;
@@ -721,7 +530,7 @@ bool Person::DoBloodBigWhere(float howmuch,int which, XYZ where){
 
        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;
@@ -780,21 +589,21 @@ bool Person::DoBloodBigWhere(float howmuch,int which, XYZ where){
                                        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){
-                                               sprites.MakeSprite(bloodsprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .05, 1);
-                                               sprites.MakeSprite(bloodflamesprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .3, 1);
+                                               Sprite::MakeSprite(bloodsprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .05, 1);
+                                               Sprite::MakeSprite(bloodflamesprite, skeleton.joints[skeleton.jointlabels[head]].position*scale+coords,bloodvel, 1,1,1, .3, 1);
                                        }
                                        if(!skeleton.free){
-                                               sprites.MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1);
-                                               sprites.MakeSprite(bloodflamesprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .3, 1);
-                                       }       
+                                               Sprite::MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[head]].position+skeleton.joints[skeleton.jointlabels[neck]].position)/2,0,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);
+                                       }
                                }
                        }
                        int offsetx=0,offsety=0;
@@ -824,7 +633,7 @@ bool Person::DoBloodBigWhere(float howmuch,int which, XYZ where){
                                                        if(i>endx)endx=i;
                                                        if(j>endy)endy=j;
                                                }
-                                       }       
+                                       }
                                }
                                if(creature==wolftype)
                                        for(i=0;i<512;i++){
@@ -835,7 +644,7 @@ bool Person::DoBloodBigWhere(float howmuch,int which, XYZ where){
                                                                if(i>endx)endx=i;
                                                                if(j>endy)endy=j;
                                                        }
-                                               }       
+                                               }
                                        }
                                        startx+=offsetx;
                                        endx+=offsetx;
@@ -894,9 +703,8 @@ bool Person::DoBloodBigWhere(float howmuch,int which, XYZ where){
                                                                        }
                                                                }
                                                        }
-                                                       glBindTexture(GL_TEXTURE_2D,skeleton.drawmodel.textureptr);
-                                                       if(detail!=2||osx)DoMipmaps(5,0,0,skeleton.skinsize,skeleton.skinsize);
-                                                       else DoMipmaps(0,startx/realtexdetail,endx/realtexdetail,starty/realtexdetail,endy/realtexdetail);
+                                                       skeleton.drawmodel.textureptr.bind();
+                                                       DoMipmaps();
 
                                                        bleedy=(1+coordsy)*512;
                                                        bleedx=coordsx*512;
@@ -915,7 +723,7 @@ bool Person::DoBloodBigWhere(float howmuch,int which, XYZ where){
        bloodloss+=bleeding*3;
 
        if(tutoriallevel!=1&&aitype!=playercontrolled&&bloodloss>damagetolerance*2/3&&bloodloss<damagetolerance&&creature==rabbittype){
-               if(abs(Random()%2)==0){aitype=gethelptype; 
+               if(abs(Random()%2)==0){aitype=gethelptype;
                lastseentime=12;
                }
                else aitype=attacktypecutoff;
@@ -926,427 +734,328 @@ bool Person::DoBloodBigWhere(float howmuch,int which, XYZ where){
 }
 
 
-void Person::DoMipmaps(int howmanylevels,float startx, float endx, float starty, float endy){
-       int i,j,k;
-       static float temp;
-       static int bytesPerPixel=3;
-       static int newsize,totalsize,rowsize,bigstep,smallstep,sum;
-       static int newstartx,newstarty,newendx,newendy;
-       static int newnewstartx,newnewstarty,newnewendx,newnewendy;
-       static int which;
-       static float sizemult;
-       /*
-       for(i=0;i<skeleton.skinsize*skeleton.skinsize*bytesPerPixel;i++){
-       texture[i]=skeleton.skinText[i];
-       }
-       */
-       if((!osx||howmanylevels)){
-
-               if(startx<0)startx=0;
-               if(starty<0)starty=0;
-               if(endx>skeleton.skinsize-1)endx=skeleton.skinsize-1;
-               if(endy>skeleton.skinsize-1)endy=skeleton.skinsize-1;
-               if((endx>startx&&endy>starty)||howmanylevels){
-
-                       newstartx=startx;
-                       newstarty=starty;
-                       newendx=endx;
-                       newendy=endy;
-
-                       for(i=startx;i<endx;i++){
-                               for(j=starty;j<endy;j++){
-                                       texturearray[(i-newstartx)*(newendy-newstarty)*3+(j-newstarty)*3+0]=skeleton.skinText[i*skeleton.skinsize*3+j*3+0];
-                                       texturearray[(i-newstartx)*(newendy-newstarty)*3+(j-newstarty)*3+1]=skeleton.skinText[i*skeleton.skinsize*3+j*3+1];
-                                       texturearray[(i-newstartx)*(newendy-newstarty)*3+(j-newstarty)*3+2]=skeleton.skinText[i*skeleton.skinsize*3+j*3+2];
-                               }
-                       }
-
-                       glBindTexture(GL_TEXTURE_2D,skeleton.drawmodel.textureptr);
-
-                       if(!howmanylevels){
-                               if(!osx)glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS,GL_TRUE);
-                               glTexSubImage2D(GL_TEXTURE_2D,0,starty,startx,endy-starty,endx-startx,GL_RGB,GL_UNSIGNED_BYTE,texturearray);
-                               if(!osx)glTexParameteri(GL_TEXTURE_2D, GL_GENERATE_MIPMAP_SGIS,GL_FALSE);
-                       }
-
-                       newsize=skeleton.skinsize;
 
-                       if(howmanylevels)
-                               gluBuild2DMipmaps( GL_TEXTURE_2D, GL_RGB, skeleton.skinsize, skeleton.skinsize, GL_RGB, GL_UNSIGNED_BYTE, &skeleton.skinText[0] );
+void Person::Reverse()
+{
+  if (!((victim->aitype == playercontrolled
+        || hostiletime > 1
+        || staggerdelay <= 0)
+       && victim->targetanimation != jumpupanim
+       && victim->targetanimation != jumpdownanim
+       && (tutoriallevel != 1 || cananger)
+       && hostile))
+    return;
+
+  if (normaldotproduct (victim->facing, victim->coords-coords) > 0
+      && (victim->id != 0 || difficulty >= 2)
+      && (creature != wolftype || victim->creature == wolftype))
+    return;
+
+  if(targetanimation==sweepanim){
+    targetanimation=sweepreversedanim;
+    currentanimation=sweepreversedanim;
+    victim->currentanimation=sweepreversalanim;
+    victim->targetanimation=sweepreversalanim;
+  }
+  if(targetanimation==spinkickanim){
+    targetanimation=spinkickreversedanim;
+    currentanimation=spinkickreversedanim;
+    victim->currentanimation=spinkickreversalanim;
+    victim->targetanimation=spinkickreversalanim;
+  }
+  if(targetanimation==upunchanim||targetanimation==rabbittacklinganim){
+    if(targetanimation==rabbittacklinganim){
+      currentframe=6;
+      targetframe=7;
+      victim->currentframe=6;
+      victim->targetframe=7;
+    }
+    targetanimation=upunchreversedanim;
+    currentanimation=upunchreversedanim;
+    victim->currentanimation=upunchreversalanim;
+    victim->targetanimation=upunchreversalanim;
+  }
+  if(targetanimation==staffhitanim&&findDistancefast(&victim->coords,&coords)<2&&((victim->id==0&&victim->crouchkeydown)||Random()%4==0)){
+    if(victim->weaponactive!=-1){
+      victim->throwtogglekeydown=1;
+      weapons[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(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0;
+      }
+
+      victim->weaponactive=-1;
+      for(int j=0;j<numplayers;j++){
+       player[j].wentforweapon=0;
+      }
+    }
+
+    targetanimation=staffhitreversedanim;
+    currentanimation=staffhitreversedanim;
+    victim->currentanimation=staffhitreversalanim;
+    victim->targetanimation=staffhitreversalanim;
+  }
+  if(targetanimation==staffspinhitanim&&findDistancefast(&victim->coords,&coords)<2&&((victim->id==0&&victim->crouchkeydown)||Random()%2==0)){
+    if(victim->weaponactive!=-1){
+      victim->throwtogglekeydown=1;
+      weapons[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(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0;
+      }
+
+      victim->weaponactive=-1;
+      for(int j=0;j<numplayers;j++){
+       player[j].wentforweapon=0;
+      }
+    }
+    targetanimation=staffspinhitreversedanim;
+    currentanimation=staffspinhitreversedanim;
+    victim->currentanimation=staffspinhitreversalanim;
+    victim->targetanimation=staffspinhitreversalanim;
+  }
+  if(targetanimation==swordslashanim&&findDistancefast(&victim->coords,&coords)<2&&((victim->id==0&&victim->crouchkeydown)||Random()%4==0)){
+    if(victim->weaponactive!=-1){
+      victim->throwtogglekeydown=1;
+      weapons[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(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0;
+      }
+
+      victim->weaponactive=-1;
+      for(int j=0;j<numplayers;j++){
+       player[j].wentforweapon=0;
+      }
+    }
+    targetanimation=swordslashreversedanim;
+    currentanimation=swordslashreversedanim;
+    victim->currentanimation=swordslashreversalanim;
+    victim->targetanimation=swordslashreversalanim;
+  }
+  if(targetanimation==knifeslashstartanim&&findDistancefast(&victim->coords,&coords)<2&&(victim->id==0||Random()%4==0)){
+    if(victim->weaponactive!=-1){
+      victim->throwtogglekeydown=1;
+      weapons[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(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0;
+      }
+
+      victim->weaponactive=-1;
+      for(int j=0;j<numplayers;j++){
+       player[j].wentforweapon=0;
+      }
+    }
+    targetanimation=knifeslashreversedanim;
+    currentanimation=knifeslashreversedanim;
+    victim->currentanimation=knifeslashreversalanim;
+    victim->targetanimation=knifeslashreversalanim;
+  }
+  if(targetanimation!=knifeslashstartanim&&targetanimation!=staffhitanim&&targetanimation!=staffspinhitanim&&targetanimation!=winduppunchanim&&targetanimation!=wolfslapanim&&targetanimation!=swordslashanim&&targetanimation!=swordslashanim){
+    victim->targettilt2=targettilt2;
+    victim->currentframe=currentframe;
+    victim->targetframe=targetframe;
+    victim->target=target;
+    victim->velocity=0;
+    victim->oldcoords=victim->coords;
+    victim->coords=coords;
+    victim->targetyaw=targetyaw;
+    victim->yaw=targetyaw;
+    victim->victim=this;
+  }
+  if(targetanimation==winduppunchanim){
+    targetanimation=winduppunchblockedanim;
+    victim->targetanimation=blockhighleftanim;
+    victim->targetframe=1;
+    victim->target=.5;
+    victim->victim=this;
+    victim->targetyaw=targetyaw+180;
+  }
+  if(targetanimation==wolfslapanim){
+    targetanimation=winduppunchblockedanim;
+    victim->targetanimation=blockhighleftanim;
+    victim->targetframe=1;
+    victim->target=.5;
+    victim->victim=this;
+    victim->targetyaw=targetyaw+180;
+  }
+  if((targetanimation==swordslashanim||targetanimation==staffhitanim||targetanimation==staffspinhitanim)&&victim->weaponactive!=-1){
+    targetanimation=swordslashparriedanim;
+    parriedrecently=.4;
+    victim->parriedrecently=0;
+    victim->targetanimation=swordslashparryanim;
+    victim->targetframe=1;
+    victim->target=.5;
+    victim->victim=this;
+    victim->targetyaw=targetyaw+180;
+
+    if(abs(Random()%20)==0||weapons[victim->weaponids[victim->weaponactive]].getType()==knife){
+      if(victim->weaponactive!=-1){
+               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);
                }
-               /*for(j=1;j<=howmanylevels;j++){
-               if(j==1)texpointer=&skeleton.skinText[0];
-               else texpointer=&texture[0];
-
-               totalsize=int( newsize*newsize*bytesPerPixel);
-               rowsize=int( newsize*bytesPerPixel );
-               bigstep=bytesPerPixel*newsize*2;
-               smallstep=bytesPerPixel*2;
-
-               which=0;
-
-
-
-               glTexSubImage2D(GL_TEXTURE_2D,j,0,0,newsize/2,newsize/2,GL_RGB,GL_UNSIGNED_BYTE,texture);
-               newsize/=2;
-               }*/
+               else{
+                 emit_sound_at(metalhitsound, victim->coords);
+               }
+      }
+      XYZ aim;
+      victim->Puff(righthand);
+      victim->target=0;
+      victim->targetframe=0;
+      victim->targetanimation=staggerbackhighanim;
+      victim->targetyaw=targetyaw+180;
+      victim->target=0;
+      weapons[victim->weaponids[0]].owner=-1;
+      aim=DoRotation(facing,0,90,0)*21;
+      aim.y+=7;
+      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(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0;
+      }
+      victim->weaponactive=-1;
+      for(int i=0;i<numplayers;i++){
+       player[i].wentforweapon=0;
+      }
+    }
+
+    if(abs(Random()%20)==0){
+      if(weaponactive!=-1){
+       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);
        }
-}
-
-
-void Person::Reverse(){
-       if(victim->aitype==playercontrolled||hostiletime>1)
-               if(victim->targetanimation!=jumpupanim&&victim->targetanimation!=jumpdownanim&&((tutoriallevel!=1||cananger)&&hostile)){
-                       if(normaldotproduct(victim->facing,victim->coords-coords)>0&&!(victim->id==0&&difficulty<2)&&(creature!=wolftype||victim->creature==wolftype))return;
-                       if(victim->aitype!=playercontrolled&&staggerdelay>0)return;
-                       if(targetanimation==sweepanim){
-                               targetanimation=sweepreversedanim;
-                               currentanimation=sweepreversedanim;
-                               victim->currentanimation=sweepreversalanim;
-                               victim->targetanimation=sweepreversalanim;
-                       }
-                       if(targetanimation==spinkickanim){
-                               targetanimation=spinkickreversedanim;
-                               currentanimation=spinkickreversedanim;
-                               victim->currentanimation=spinkickreversalanim;
-                               victim->targetanimation=spinkickreversalanim;
-                       }
-                       if(targetanimation==upunchanim||targetanimation==rabbittacklinganim){
-                               if(targetanimation==rabbittacklinganim){
-                                       currentframe=6;
-                                       targetframe=7;
-                                       victim->currentframe=6;
-                                       victim->targetframe=7;
-                               }
-                               targetanimation=upunchreversedanim;
-                               currentanimation=upunchreversedanim;
-                               victim->currentanimation=upunchreversalanim;
-                               victim->targetanimation=upunchreversalanim;
-                       }
-                       if(targetanimation==staffhitanim&&findDistancefast(&victim->coords,&coords)<2&&((victim->id==0&&victim->crouchkeydown)||Random()%4==0)){
-                               if(victim->weaponactive!=-1){
-                                       victim->throwtogglekeydown=1;
-                                       weapons.owner[victim->weaponids[0]]=-1;
-                                       weapons.velocity[victim->weaponids[0]]=victim->velocity*.2;
-                                       if(weapons.velocity[victim->weaponids[0]].x==0)weapons.velocity[victim->weaponids[0]].x=.1;
-                                       weapons.tipvelocity[victim->weaponids[0]]=weapons.velocity[victim->weaponids[0]];
-                                       weapons.missed[victim->weaponids[0]]=1;
-                                       weapons.freetime[victim->weaponids[0]]=0;
-                                       weapons.firstfree[victim->weaponids[0]]=1;
-                                       weapons.physics[victim->weaponids[0]]=1;
-                                       victim->num_weapons--;
-                                       if(victim->num_weapons){
-                                               victim->weaponids[0]=victim->weaponids[victim->num_weapons];
-                                               if(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0;
-                                }
-
-                                       victim->weaponactive=-1;
-                                       for(int j=0;j<numplayers;j++){
-                                               player[j].wentforweapon=0;
-                                }
-                               }
-
-                               targetanimation=staffhitreversedanim;
-                               currentanimation=staffhitreversedanim;
-                               victim->currentanimation=staffhitreversalanim;
-                               victim->targetanimation=staffhitreversalanim;
-                       }
-                       if(targetanimation==staffspinhitanim&&findDistancefast(&victim->coords,&coords)<2&&((victim->id==0&&victim->crouchkeydown)||Random()%2==0)){
-                               if(victim->weaponactive!=-1){
-                                       victim->throwtogglekeydown=1;
-                                       weapons.owner[victim->weaponids[0]]=-1;
-                                       weapons.velocity[victim->weaponids[0]]=victim->velocity*.2;
-                                       if(weapons.velocity[victim->weaponids[0]].x==0)weapons.velocity[victim->weaponids[0]].x=.1;
-                                       weapons.tipvelocity[victim->weaponids[0]]=weapons.velocity[victim->weaponids[0]];
-                                       weapons.missed[victim->weaponids[0]]=1;
-                                       weapons.freetime[victim->weaponids[0]]=0;
-                                       weapons.firstfree[victim->weaponids[0]]=1;
-                                       weapons.physics[victim->weaponids[0]]=1;
-                                       victim->num_weapons--;
-                                       if(victim->num_weapons){
-                                               victim->weaponids[0]=victim->weaponids[victim->num_weapons];
-                                               if(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0;
-                                }
-
-                                       victim->weaponactive=-1;
-                                       for(int j=0;j<numplayers;j++){
-                                               player[j].wentforweapon=0;
-                                }
-                               }
-                               targetanimation=staffspinhitreversedanim;
-                               currentanimation=staffspinhitreversedanim;
-                               victim->currentanimation=staffspinhitreversalanim;
-                               victim->targetanimation=staffspinhitreversalanim;
-                       }
-                       if(targetanimation==swordslashanim&&findDistancefast(&victim->coords,&coords)<2&&((victim->id==0&&victim->crouchkeydown)||Random()%4==0)){
-                               if(victim->weaponactive!=-1){
-                                       victim->throwtogglekeydown=1;
-                                       weapons.owner[victim->weaponids[0]]=-1;
-                                       weapons.velocity[victim->weaponids[0]]=victim->velocity*.2;
-                                       if(weapons.velocity[victim->weaponids[0]].x==0)weapons.velocity[victim->weaponids[0]].x=.1;
-                                       weapons.tipvelocity[victim->weaponids[0]]=weapons.velocity[victim->weaponids[0]];
-                                       weapons.missed[victim->weaponids[0]]=1;
-                                       weapons.freetime[victim->weaponids[0]]=0;
-                                       weapons.firstfree[victim->weaponids[0]]=1;
-                                       weapons.physics[victim->weaponids[0]]=1;
-                                       victim->num_weapons--;
-                                       if(victim->num_weapons){
-                                               victim->weaponids[0]=victim->weaponids[victim->num_weapons];
-                                               if(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0;
-                                }
-
-                                       victim->weaponactive=-1;
-                                       for(int j=0;j<numplayers;j++){
-                                               player[j].wentforweapon=0;
-                                }
-                               }
-                               targetanimation=swordslashreversedanim;
-                               currentanimation=swordslashreversedanim;
-                               victim->currentanimation=swordslashreversalanim;
-                               victim->targetanimation=swordslashreversalanim;
-                       }
-                       if(targetanimation==knifeslashstartanim&&findDistancefast(&victim->coords,&coords)<2&&(victim->id==0||Random()%4==0)){
-                               if(victim->weaponactive!=-1){
-                                       victim->throwtogglekeydown=1;
-                                       weapons.owner[victim->weaponids[0]]=-1;
-                                       weapons.velocity[victim->weaponids[0]]=victim->velocity*.2;
-                                       if(weapons.velocity[victim->weaponids[0]].x==0)weapons.velocity[victim->weaponids[0]].x=.1;
-                                       weapons.tipvelocity[victim->weaponids[0]]=weapons.velocity[victim->weaponids[0]];
-                                       weapons.missed[victim->weaponids[0]]=1;
-                                       weapons.freetime[victim->weaponids[0]]=0;
-                                       weapons.firstfree[victim->weaponids[0]]=1;
-                                       weapons.physics[victim->weaponids[0]]=1;
-                                       victim->num_weapons--;
-                                       if(victim->num_weapons){
-                                               victim->weaponids[0]=victim->weaponids[victim->num_weapons];
-                                               if(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0;
-                                }
-
-                                       victim->weaponactive=-1;
-                                       for(int j=0;j<numplayers;j++){
-                                               player[j].wentforweapon=0;
-                                }
-                               }
-                               targetanimation=knifeslashreversedanim;
-                               currentanimation=knifeslashreversedanim;
-                               victim->currentanimation=knifeslashreversalanim;
-                               victim->targetanimation=knifeslashreversalanim;
-                       }
-                       if(targetanimation!=knifeslashstartanim&&targetanimation!=staffhitanim&&targetanimation!=staffspinhitanim&&targetanimation!=winduppunchanim&&targetanimation!=wolfslapanim&&targetanimation!=swordslashanim&&targetanimation!=swordslashanim){
-                               victim->targettilt2=targettilt2;
-                               victim->currentframe=currentframe;
-                               victim->targetframe=targetframe;
-                               victim->target=target;
-                               victim->velocity=0;
-                               victim->oldcoords=victim->coords;
-                               victim->coords=coords;
-                               victim->targetrotation=targetrotation;
-                               victim->rotation=targetrotation;
-                               victim->victim=this;
-                       }
-                       if(targetanimation==winduppunchanim){
-                               targetanimation=winduppunchblockedanim;
-                               victim->targetanimation=blockhighleftanim;
-                               victim->targetframe=1;
-                               victim->target=.5;
-                               victim->victim=this;
-                               victim->targetrotation=targetrotation+180;
-                       }
-                       if(targetanimation==wolfslapanim){
-                               targetanimation=winduppunchblockedanim;
-                               victim->targetanimation=blockhighleftanim;
-                               victim->targetframe=1;
-                               victim->target=.5;
-                               victim->victim=this;
-                               victim->targetrotation=targetrotation+180;
-                       }
-                       if((targetanimation==swordslashanim||targetanimation==staffhitanim||targetanimation==staffspinhitanim)&&victim->weaponactive!=-1){
-                               targetanimation=swordslashparriedanim;
-                               parriedrecently=.4;
-                               victim->parriedrecently=0;
-                               victim->targetanimation=swordslashparryanim;
-                               victim->targetframe=1;
-                               victim->target=.5;
-                               victim->victim=this;
-                               victim->targetrotation=targetrotation+180;
-
-                               if(abs(Random()%20)==0||weapons.type[victim->weaponids[victim->weaponactive]]==knife){
-                                       float gLoc[3];
-                                       float vel[3];
-                                       gLoc[0]=victim->coords.x;
-                                       gLoc[1]=victim->coords.y;
-                                       gLoc[2]=victim->coords.z;
-                                       vel[0]=velocity.x;
-                                       vel[1]=velocity.y;
-                                       vel[2]=velocity.z;
-                                       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;
-
-                                                       PlaySoundEx( swordstaffsound, samp[swordstaffsound], NULL, TRUE);
-                                                       FSOUND_3D_SetAttributes(channels[swordstaffsound], gLoc, vel);
-                                                       FSOUND_SetVolume(channels[swordstaffsound], 512);
-                                                       FSOUND_SetPaused(channels[swordstaffsound], FALSE);
-                                               }
-                                               else{
-                                                       PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, TRUE);
-                                                       FSOUND_3D_SetAttributes(channels[metalhitsound], gLoc, vel);
-                                                       FSOUND_SetVolume(channels[metalhitsound], 512);
-                                                       FSOUND_SetPaused(channels[metalhitsound], FALSE);
-                                               }
-                                       }
-                                       XYZ aim;
-                                       victim->Puff(righthand);
-                                       victim->target=0;
-                                       victim->targetframe=0;
-                                       victim->targetanimation=staggerbackhighanim;
-                                       victim->targetrotation=targetrotation+180;
-                                       victim->target=0;
-                                       weapons.owner[victim->weaponids[0]]=-1;
-                                       aim=DoRotation(facing,0,90,0)*21;
-                                       aim.y+=7;
-                                       weapons.velocity[victim->weaponids[0]]=aim*-.2;
-                                       weapons.tipvelocity[victim->weaponids[0]]=aim;
-                                       weapons.missed[victim->weaponids[0]]=1;
-                                       weapons.hitsomething[victim->weaponids[0]]=0;
-                                       weapons.freetime[victim->weaponids[0]]=0;
-                                       weapons.firstfree[victim->weaponids[0]]=1;
-                                       weapons.physics[victim->weaponids[0]]=1;
-                                       victim->num_weapons--;
-                                       if(victim->num_weapons){
-                                               victim->weaponids[0]=victim->weaponids[num_weapons];
-                                               if(victim->weaponstuck==victim->num_weapons)victim->weaponstuck=0;
-                                }
-                                       victim->weaponactive=-1;
-                                       for(int i=0;i<numplayers;i++){
-                                               player[i].wentforweapon=0;
-                                }
-
-
-
-
-
-                                       /*PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, TRUE);
-                                       FSOUND_3D_SetAttributes(channels[metalhitsound], gLoc, vel);
-                                       FSOUND_SetVolume(channels[metalhitsound], 512);
-                                       FSOUND_SetPaused(channels[metalhitsound], FALSE);*/
-                               }
-
-                               if(abs(Random()%20)==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(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;
-
-                                                       PlaySoundEx( swordstaffsound, samp[swordstaffsound], NULL, TRUE);
-                                                       FSOUND_3D_SetAttributes(channels[swordstaffsound], gLoc, vel);
-                                                       FSOUND_SetVolume(channels[swordstaffsound], 512);
-                                                       FSOUND_SetPaused(channels[swordstaffsound], FALSE);
-                                               }
-                                               else{
-                                                       PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, TRUE);
-                                                       FSOUND_3D_SetAttributes(channels[metalhitsound], gLoc, vel);
-                                                       FSOUND_SetVolume(channels[metalhitsound], 512);
-                                                       FSOUND_SetPaused(channels[metalhitsound], FALSE);
-                                               }
-                                       }
-
-                                       XYZ aim;
-                                       Puff(righthand);
-                                       target=0;
-                                       targetframe=0;
-                                       targetanimation=staggerbackhighanim;
-                                       targetrotation=targetrotation+180;
-                                       target=0;
-                                       weapons.owner[weaponids[0]]=-1;
-                                       aim=DoRotation(facing,0,90,0)*21;
-                                       aim.y+=7;
-                                       weapons.velocity[weaponids[0]]=aim*-.2;
-                                       weapons.tipvelocity[weaponids[0]]=aim;
-                                       weapons.hitsomething[weaponids[0]]=0;
-                                       weapons.missed[weaponids[0]]=1;
-                                       weapons.freetime[weaponids[0]]=0;
-                                       weapons.firstfree[weaponids[0]]=1;
-                                       weapons.physics[weaponids[0]]=1;
-                                       num_weapons--;
-                                       if(num_weapons){
-                                               weaponids[0]=weaponids[num_weapons];
-                                               if(weaponstuck==num_weapons)weaponstuck=0;
-                                }
-                                       weaponactive=-1;
-                                       for(int i=0;i<numplayers;i++){
-                                               player[i].wentforweapon=0;
-                                }
-
-
-                                       /*PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, TRUE);
-                                       FSOUND_3D_SetAttributes(channels[metalhitsound], gLoc, vel);
-                                       FSOUND_SetVolume(channels[metalhitsound], 512);
-                                       FSOUND_SetPaused(channels[metalhitsound], FALSE);*/
-                               }
-                       }
-                       if(hasvictim)
-                               if(targetanimation==knifeslashstartanim||targetanimation==swordslashanim||targetanimation==staffhitanim||targetanimation==staffspinhitanim){
-                                       if((targetanimation!=staffhitanim&&targetanimation!=staffspinhitanim)||findDistancefast(&coords,&victim->coords)>.2){
-                                               //victim->targetanimation=sweepanim;
-                                               victim->targetanimation=dodgebackanim;
-                                               victim->targetframe=0;
-                                               victim->target=0;
-                                               //victim->velocity=0;
-
-                                               XYZ rotatetarget;
-                                               rotatetarget=coords-victim->coords;
-                                               Normalise(&rotatetarget);
-                                               victim->targetrotation=-asin(0-rotatetarget.x);
-                                               victim->targetrotation*=360/6.28;
-                                               if(rotatetarget.z<0)victim->targetrotation=180-victim->targetrotation;
-
-                                               victim->targettilt2=-asin(rotatetarget.y)*360/6.28;//*-70;
-
-                                               victim->lastattack3=victim->lastattack2;
-                                               victim->lastattack2=victim->lastattack;
-                                               victim->lastattack=victim->targetanimation;
-                                       }
-                                       else
-                                       {
-                                               victim->targetanimation=sweepanim;
-                                               victim->targetframe=0;
-                                               victim->target=0;
-
-                                               XYZ rotatetarget;
-                                               rotatetarget=coords-victim->coords;
-                                               Normalise(&rotatetarget);
-                                               victim->targetrotation=-asin(0-rotatetarget.x);
-                                               victim->targetrotation*=360/6.28;
-                                               if(rotatetarget.z<0)victim->targetrotation=180-victim->targetrotation;
-
-                                               victim->targettilt2=-asin(rotatetarget.y)*360/6.28;//*-70;
-
-                                               victim->lastattack3=victim->lastattack2;
-                                               victim->lastattack2=victim->lastattack;
-                                               victim->lastattack=victim->targetanimation;
-                                       }
-                               }
+       else{
+         emit_sound_at(metalhitsound, coords);
+       }
+      }
+
+      XYZ aim;
+      Puff(righthand);
+      target=0;
+      targetframe=0;
+      targetanimation=staggerbackhighanim;
+      targetyaw=targetyaw+180;
+      target=0;
+      weapons[weaponids[0]].owner=-1;
+      aim=DoRotation(facing,0,90,0)*21;
+      aim.y+=7;
+      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];
+       if(weaponstuck==num_weapons)weaponstuck=0;
+      }
+      weaponactive=-1;
+      for(int i=0;i<numplayers;i++){
+       player[i].wentforweapon=0;
+      }
+
+
+    }
+  }
+  if(hasvictim)
+    if(targetanimation==knifeslashstartanim||targetanimation==swordslashanim||targetanimation==staffhitanim||targetanimation==staffspinhitanim){
+      if((targetanimation!=staffhitanim&&targetanimation!=staffspinhitanim)||findDistancefast(&coords,&victim->coords)>.2){
+       victim->targetanimation=dodgebackanim;
+       victim->targetframe=0;
+       victim->target=0;
+
+       XYZ rotatetarget;
+       rotatetarget=coords-victim->coords;
+       Normalise(&rotatetarget);
+       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;
+
+       victim->lastattack3=victim->lastattack2;
+       victim->lastattack2=victim->lastattack;
+       victim->lastattack=victim->targetanimation;
+      }
+      else
+       {
+         victim->targetanimation=sweepanim;
+         victim->targetframe=0;
+         victim->target=0;
+
+         XYZ rotatetarget;
+         rotatetarget=coords-victim->coords;
+         Normalise(&rotatetarget);
+         victim->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;
+
+         victim->lastattack3=victim->lastattack2;
+         victim->lastattack2=victim->lastattack;
+         victim->lastattack=victim->targetanimation;
+       }
+    }
 
-                               velocity=0;
-                               victim->velocity=0;
+  velocity=0;
+  victim->velocity=0;
 
-                               if(aitype!=playercontrolled)feint=0;
-                               if(aitype!=playercontrolled&&Random()%3==0&&escapednum<2&&difficulty==2)feint=1;
-                               if(aitype!=playercontrolled&&Random()%5==0&&escapednum<2&&difficulty==1)feint=1;
-                               if(aitype!=playercontrolled&&Random()%10==0&&escapednum<2&&difficulty==0)feint=1;
+  if(aitype!=playercontrolled)feint=0;
+  if(aitype!=playercontrolled&&Random()%3==0&&escapednum<2&&difficulty==2)feint=1;
+  if(aitype!=playercontrolled&&Random()%5==0&&escapednum<2&&difficulty==1)feint=1;
+  if(aitype!=playercontrolled&&Random()%10==0&&escapednum<2&&difficulty==0)feint=1;
 
-                               if(victim->id==0&&animation[victim->targetanimation].attack==reversal)numreversals++;
-               }
+  if(victim->id==0&&animation[victim->targetanimation].attack==reversal)numreversals++;
 }
 
 void Person::DoDamage(float howmuch){
@@ -1366,7 +1075,7 @@ void Person::DoDamage(float howmuch){
 
        if(aitype==passivetype&&damage<damagetolerance&&((tutoriallevel!=1||cananger)&&hostile))aitype=attacktypecutoff;
        if(tutoriallevel!=1&&aitype!=playercontrolled&&damage<damagetolerance&&damage>damagetolerance*2/3&&creature==rabbittype){
-               if(abs(Random()%2)==0){aitype=gethelptype; 
+               if(abs(Random()%2)==0){aitype=gethelptype;
                lastseentime=12;
                }
                else aitype=attacktypecutoff;
@@ -1379,28 +1088,17 @@ void Person::DoDamage(float howmuch){
                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;
                        flatvelocity2.z+=(float)(abs(Random()%100)-50)/10;
-                       sprites.MakeSprite(bloodflamesprite, flatfacing2,flatvelocity2, 1,1,1, 3, 1);
-                       sprites.MakeSprite(bloodsprite, flatfacing2,flatvelocity2, 1,1,1, .4, 1);
-                       sprites.MakeSprite(cloudsprite, flatfacing2,flatvelocity2*0, .6,0,0, 1, .5);
+                       Sprite::MakeSprite(bloodflamesprite, flatfacing2,flatvelocity2, 1,1,1, 3, 1);
+                       Sprite::MakeSprite(bloodsprite, flatfacing2,flatvelocity2, 1,1,1, .4, 1);
+                       Sprite::MakeSprite(cloudsprite, flatfacing2,flatvelocity2*0, .6,0,0, 1, .5);
                }
 
-               float gLoc[3];
-               float vel[3];
-               gLoc[0]=coords.x;
-               gLoc[1]=coords.y;
-               gLoc[2]=coords.z;
-               vel[0]=0;
-               vel[1]=0;
-               vel[2]=0;
-               PlaySoundEx( splattersound, samp[splattersound], NULL, TRUE);
-               FSOUND_3D_SetAttributes(channels[splattersound], gLoc, vel);
-               FSOUND_SetVolume(channels[splattersound], 256);
-               FSOUND_SetPaused(channels[splattersound], FALSE);
+               emit_sound_at(splattersound, coords);
 
                skeleton.free=2;
                DoDamage(10000);
@@ -1410,9 +1108,7 @@ void Person::DoDamage(float howmuch){
                slomodelay=.2;
                }*/
                if(!dead&&creature==wolftype){
-                       bonus=Wolfbonus;
-                       bonustime=0;
-                       bonusvalue=300; 
+                 award_bonus(0, Wolfbonus);
                }
                dead=2;
                coords=20;
@@ -1421,14 +1117,6 @@ void Person::DoDamage(float howmuch){
        if(tutoriallevel!=1||id==0)
                if(speechdelay<=0&&!dead&&aitype!=playercontrolled){
                        int whichsound=-1;
-                       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(creature==wolftype){
                                int i=abs(Random()%2);
@@ -1451,10 +1139,7 @@ void Person::DoDamage(float howmuch){
                        }
 
                        if(whichsound!=-1){
-                               PlaySoundEx( whichsound, samp[whichsound], NULL, TRUE);
-                               FSOUND_3D_SetAttributes(channels[whichsound], gLoc, vel);
-                               FSOUND_SetVolume(channels[whichsound], 512);
-                               FSOUND_SetPaused(channels[whichsound], FALSE);
+                               emit_sound_at(whichsound, coords);
                        }
                }
                speechdelay=.3;
@@ -1468,71 +1153,71 @@ void Person::DoHead(){
        static XYZ facing;
        static float lookspeed=500;
 
-       if(!freeze&&!winfreeze&&(!mainmenu||!gamestarted)){
+       if(!freeze&&!winfreeze){
 
                //head facing
-               targetheadrotation=(float)((int)((0-rotation-targetheadrotation+180)*100)%36000)/100;
-               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))
@@ -1555,7 +1240,7 @@ void Person::RagDoll(bool checkcollision){
 
                facing=0;
                facing.z=1;
-               facing=DoRotation(facing,0,rotation,0);
+               facing=DoRotation(facing,0,yaw,0);
 
                skeleton.freetime=0;
 
@@ -1570,7 +1255,7 @@ void Person::RagDoll(bool checkcollision){
                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;
@@ -1578,8 +1263,8 @@ void Person::RagDoll(bool checkcollision){
                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;
@@ -1609,7 +1294,7 @@ void Person::RagDoll(bool checkcollision){
                speed*=speedmult;
 
                for(i=0;i<skeleton.num_joints;i++){
-                       if((animation[currentanimation].attack!=reversed||currentanimation==swordslashreversedanim)&&currentanimation!=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)&&currentanimation!=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;
@@ -1641,21 +1326,21 @@ void Person::RagDoll(bool checkcollision){
                                skeleton.joints[j].position-=average;
                        }
 
-                       whichpatchx=coords.x/(terrain.size/subdivision*terrain.scale*terraindetail);
-                       whichpatchz=coords.z/(terrain.size/subdivision*terrain.scale*terraindetail);
+                       whichpatchx=coords.x/(terrain.size/subdivision*terrain.scale);
+                       whichpatchz=coords.z/(terrain.size/subdivision*terrain.scale);
                        if(terrain.patchobjectnum[whichpatchx][whichpatchz])
                                for(l=0;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;
@@ -1666,15 +1351,15 @@ void Person::RagDoll(bool checkcollision){
 
                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];
@@ -1703,48 +1388,48 @@ void Person::FootLand(int which, float opacity){
                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))sprites.MakeSprite(cloudsprite, footpoint,footvel, 1,1,1, .5, .2*opacity);
+                       if(findDistancefast(&footpoint,&viewer))Sprite::MakeSprite(cloudsprite, footpoint,footvel, 1,1,1, .5, .2*opacity);
                }
                else if(environment==snowyenvironment&&onterrain&&terrain.getOpacity(coords.x,coords.z)<.2){
                        footvel=velocity/5;
                        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)sprites.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(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,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)sprites.MakeSprite(cloudsprite, footpoint,footvel*.6, terrainlight.x*90/255,terrainlight.y*70/255,terrainlight.z*8/255, .5, .5*opacity);
+                       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)sprites.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(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,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)sprites.MakeSprite(cloudsprite, footpoint,footvel*.6, 1,1,1, .5, .2*opacity);
+                       if(findDistancefast(&footpoint,&viewer)<viewdistance*viewdistance/4)Sprite::MakeSprite(cloudsprite, footpoint,footvel*.6, 1,1,1, .5, .2*opacity);
                }
 }
 
@@ -1752,181 +1437,21 @@ void Person::Puff(int whichlabel){
        static XYZ footvel,footpoint;
 
        footvel=0;
-       footpoint=DoRotation(skeleton.joints[skeleton.jointlabels[whichlabel]].position,0,rotation,0)*scale+coords;
-       sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,1,1, .9, .3);
+       footpoint=DoRotation(skeleton.joints[skeleton.jointlabels[whichlabel]].position,0,yaw,0)*scale+coords;
+       Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,1,1, .9, .3);
 }
 
-
-/*
-HitStruct      Person::BulletCollideWithPlayer(XYZ start, XYZ end){
-float damage=20;
-XYZ tempbulletloc[2];
-XYZ collisionpoint;
-XYZ sparkpos;
-GLfloat M[16];
-int collide;
-float howfar;
-XYZ average;
-XYZ facing;
-int howmany;
-float distancemax;
-HitStruct hitstruct;
-hitstruct.collision=0;
-//Make bounding sphere
-average=0;
-howmany=0;
-for(int j=0;j<skeleton.num_joints;j++){
-average.x=average.x+skeleton.joints[j].position.x;
-average.y=average.y+skeleton.joints[j].position.y;
-average.z=average.z+skeleton.joints[j].position.z;
-howmany++;
-}
-average=average/howmany;
-distancemax=0;
-for(int j=0;j<skeleton.num_joints;j++){
-if(findDistancefast(average,skeleton.joints[j].position)>distancemax){
-distancemax=findDistancefast(average,skeleton.joints[j].position);
-}
-}
-distancemax=fast_sqrt(distancemax);
-//Collide with player
-if(skeleton.free<1){
-start=start-coords;
-end=end-coords;
-if(rotation)start=DoRotation(start,0,-rotation,0);
-if(rotation)end=DoRotation(end,0,-rotation,0);
-}
-tempbulletloc[0]=start;
-tempbulletloc[1]=end;
-if(sphere_line_intersection(tempbulletloc[0].x,tempbulletloc[0].y,tempbulletloc[0].z,
-tempbulletloc[1].x,tempbulletloc[1].y,tempbulletloc[1].z,
-average.x, average.y, average.z, distancemax)){
-for(int j=0;j<skeleton.num_joints;j++){
-if(skeleton.joints[j].hasparent&&skeleton.joints[j].visible){
-tempbulletloc[0]=start;
-tempbulletloc[1]=end;
-glPushMatrix();
-glLoadIdentity();
-glScalef(1,1/skeleton.joints[j].length,1);
-glRotatef(skeleton.joints[j].rotate2-90,0,0,1);
-glRotatef(skeleton.joints[j].rotate1-90,0,1,0);
-glTranslatef(  (-(skeleton.joints[j].position.x+skeleton.joints[j].parent->position.x)/2),
-(-(skeleton.joints[j].position.y+skeleton.joints[j].parent->position.y)/2),
-(-(skeleton.joints[j].position.z+skeleton.joints[j].parent->position.z)/2));
-glTranslatef(tempbulletloc[0].x,tempbulletloc[0].y,tempbulletloc[0].z);
-glGetFloatv(GL_MODELVIEW_MATRIX,M);
-tempbulletloc[0].x=M[12];
-tempbulletloc[0].y=M[13];
-tempbulletloc[0].z=M[14];
-glPopMatrix();
-glPushMatrix();
-glLoadIdentity();
-glScalef(1,1/skeleton.joints[j].length,1);
-glRotatef(skeleton.joints[j].rotate2-90,0,0,1);
-glRotatef(skeleton.joints[j].rotate1-90,0,1,0);
-glTranslatef(  (-(skeleton.joints[j].position.x+skeleton.joints[j].parent->position.x)/2),
-(-(skeleton.joints[j].position.y+skeleton.joints[j].parent->position.y)/2),
-(-(skeleton.joints[j].position.z+skeleton.joints[j].parent->position.z)/2));
-glTranslatef(tempbulletloc[1].x,tempbulletloc[1].y,tempbulletloc[1].z);
-glGetFloatv(GL_MODELVIEW_MATRIX,M);
-tempbulletloc[1].x=M[12];
-tempbulletloc[1].y=M[13];
-tempbulletloc[1].z=M[14];
-glPopMatrix();
-collide=skeletonmodels[skeleton.joints[j].modelnum].LineCheck(tempbulletloc[0],tempbulletloc[1],&collisionpoint);
-if(collide!=-1)
-{
-glPushMatrix();
-glLoadIdentity();
-glTranslatef(  (skeleton.joints[j].position.x+skeleton.joints[j].parent->position.x)/2,
-(skeleton.joints[j].position.y+skeleton.joints[j].parent->position.y)/2,
-(skeleton.joints[j].position.z+skeleton.joints[j].parent->position.z)/2);
-glRotatef(-skeleton.joints[j].rotate1+90,0,1,0);
-glRotatef(-skeleton.joints[j].rotate2+90,0,0,1);
-glScalef(1,skeleton.joints[j].length,1);
-glTranslatef(collisionpoint.x,collisionpoint.y,collisionpoint.z);
-glGetFloatv(GL_MODELVIEW_MATRIX,M);
-collisionpoint.x=M[12];
-collisionpoint.y=M[13];
-collisionpoint.z=M[14];
-glPopMatrix();
-hitstruct.collision=1;
-hitstruct.hitlocation=collisionpoint;
-hitstruct.joint1=&skeleton.joints[j];
-hitstruct.joint2=skeleton.joints[j].parent;
-}
-}
+Joint& Person::getJointFor(int bodypart) {
+    return skeleton.joints[skeleton.jointlabels[bodypart]]; 
 }
-for(int j=0;j<skeleton.num_muscles;j++){
-if(skeleton.muscles[j].visible){
-tempbulletloc[0]=start;
-tempbulletloc[1]=end;
-glPushMatrix();
-glLoadIdentity();
-glScalef(1,1/skeleton.muscles[j].length,1);
-glRotatef(skeleton.muscles[j].rotate3,0,1,0);
-glRotatef(skeleton.muscles[j].rotate2-90,0,0,1);
-glRotatef(skeleton.muscles[j].rotate1-90,0,1,0);
-glTranslatef(  (-(skeleton.muscles[j].parent1->position.x+skeleton.muscles[j].parent2->position.x)/2),
-(-(skeleton.muscles[j].parent1->position.y+skeleton.muscles[j].parent2->position.y)/2),
-(-(skeleton.muscles[j].parent1->position.z+skeleton.muscles[j].parent2->position.z)/2));
-
-glTranslatef(tempbulletloc[0].x,tempbulletloc[0].y,tempbulletloc[0].z);
-glGetFloatv(GL_MODELVIEW_MATRIX,M);
-tempbulletloc[0].x=M[12];
-tempbulletloc[0].y=M[13];
-tempbulletloc[0].z=M[14];
-glPopMatrix();
-glPushMatrix();
-glLoadIdentity();
-glScalef(1,1/skeleton.muscles[j].length,1);
-glRotatef(skeleton.muscles[j].rotate3,0,1,0);
-glRotatef(skeleton.muscles[j].rotate2-90,0,0,1);
-glRotatef(skeleton.muscles[j].rotate1-90,0,1,0);
-
-glTranslatef(  (-(skeleton.muscles[j].parent1->position.x+skeleton.muscles[j].parent2->position.x)/2),
-(-(skeleton.muscles[j].parent1->position.y+skeleton.muscles[j].parent2->position.y)/2),
-(-(skeleton.muscles[j].parent1->position.z+skeleton.muscles[j].parent2->position.z)/2));
-glTranslatef(tempbulletloc[1].x,tempbulletloc[1].y,tempbulletloc[1].z);
-glGetFloatv(GL_MODELVIEW_MATRIX,M);
-tempbulletloc[1].x=M[12];
-tempbulletloc[1].y=M[13];
-tempbulletloc[1].z=M[14];
-glPopMatrix();
-collide=skeletonmodels[skeleton.muscles[j].parent1->modelnum].LineCheck(tempbulletloc[0],tempbulletloc[1],&collisionpoint);
-if(collide!=-1)
-{
-glPushMatrix();
-glLoadIdentity();
-glTranslatef(  (skeleton.muscles[j].parent1->position.x+skeleton.muscles[j].parent2->position.x)/2,
-(skeleton.muscles[j].parent1->position.y+skeleton.muscles[j].parent2->position.y)/2,
-(skeleton.muscles[j].parent1->position.z+skeleton.muscles[j].parent2->position.z)/2);
-glRotatef(-skeleton.muscles[j].rotate1+90,0,1,0);
-glRotatef(-skeleton.muscles[j].rotate2+90,0,0,1);
-glRotatef(-skeleton.muscles[j].rotate3,0,1,0);
-glScalef(1,findDistance(skeleton.muscles[j].parent1->position,skeleton.muscles[j].parent2->position),1);
-glTranslatef(collisionpoint.x,collisionpoint.y,collisionpoint.z);
-glGetFloatv(GL_MODELVIEW_MATRIX,M);
-collisionpoint.x=M[12];
-collisionpoint.y=M[13];
-collisionpoint.z=M[14];
-glPopMatrix();
-hitstruct.collision=1;
-hitstruct.hitlocation=collisionpoint;
-hitstruct.joint1=skeleton.muscles[j].parent1;
-hitstruct.joint2=skeleton.muscles[j].parent2;
-}
-}
-}
-}
-if(skeleton.free<1){
-if(rotation)hitstruct.hitlocation=DoRotation(hitstruct.hitlocation,0,rotation,0);
-hitstruct.hitlocation=hitstruct.hitlocation+coords;
-}
-return hitstruct;
+
+void Person::setAnimation(int animation) {
+    targetanimation=animation;
+    targetframe=0;
+    target=0;
 }
-*/
-void   Person::DoAnimations(){ 
+
+void   Person::DoAnimations(){
        if(!skeleton.free){
                int i = 0;
                static float oldtarget;
@@ -1934,7 +1459,7 @@ void      Person::DoAnimations(){
                if(isIdle()&&currentanimation!=getIdle())normalsupdatedelay=0;
 
                if(targetanimation==tempanim||currentanimation==tempanim){
-                       animation[tempanim]=tempanimation;                      
+                       animation[tempanim]=tempanimation;
                }
                if(targetanimation==jumpupanim||targetanimation==jumpdownanim||isFlip()){
                        float gLoc[3];
@@ -1947,10 +1472,10 @@ void    Person::DoAnimations(){
                        vel[2]=velocity.z;
 
                        if(id==0){
-                               FSOUND_3D_SetAttributes(channels[whooshsound], gLoc, vel);
-                               FSOUND_SetVolume(channels[whooshsound], 64*findLength(&velocity)/5);
+                               OPENAL_3D_SetAttributes(channels[whooshsound], gLoc, vel);
+                               OPENAL_SetVolume(channels[whooshsound], 64*findLength(&velocity)/5);
                        }
-                       if(((velocity.y<-15)||(crouchkeydown&&velocity.y<-8))&&abs(velocity.y)*4>fast_sqrt(velocity.x*velocity.x*velocity.z*velocity.z))landhard=1;                     
+                       if(((velocity.y<-15)||(crouchkeydown&&velocity.y<-8))&&abs(velocity.y)*4>fast_sqrt(velocity.x*velocity.x*velocity.z*velocity.z))landhard=1;
                        if(!crouchkeydown&&velocity.y>=-15)landhard=0;
                }
                if((currentanimation==jumpupanim||targetanimation==jumpdownanim)/*&&velocity.y<40*/&&!isFlip()&&(!isLanding()&&!isLandhard())&&((crouchkeydown&&!crouchtogglekeydown))){
@@ -1958,7 +1483,7 @@ void      Person::DoAnimations(){
                        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;
@@ -1974,7 +1499,7 @@ void      Person::DoAnimations(){
                        crouchtogglekeydown=0;
                        if(aitype==playercontrolled)feint=0;
                }
-               else 
+               else
                {
                        if(!crouchtogglekeydown&&animation[targetanimation].attack==reversed&&aitype==playercontrolled&&(escapednum<2||reversaltrain))feint=1;
                        if(!isFlip())crouchtogglekeydown=1;
@@ -1988,19 +1513,8 @@ void     Person::DoAnimations(){
                if(target>=1){
                        if(targetanimation==rollanim&&targetframe==3&&onfire){
                                onfire=0;
-                               float gLoc[3];
-                               float vel[3];
-                               gLoc[0]=coords.x;
-                               gLoc[1]=coords.y;
-                               gLoc[2]=coords.z;
-                               vel[0]=0;
-                               vel[1]=0;
-                               vel[2]=0;
-                               PlaySoundEx( fireendsound, samp[fireendsound], NULL, TRUE);
-                               FSOUND_3D_SetAttributes(channels[fireendsound], gLoc, vel);
-                               FSOUND_SetVolume(channels[fireendsound], 256);
-                               FSOUND_SetPaused(channels[fireendsound], FALSE);
-                               FSOUND_SetPaused(channels[stream_firesound], TRUE);
+                               emit_sound_at(fireendsound, coords);
+                               pause_sound(stream_firesound);
                                deathbleeding=0;
                        }
 
@@ -2012,70 +1526,31 @@ void    Person::DoAnimations(){
                                        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){
                                                DoBloodBig(0,255);
-                                               float gLoc[3];
-                                               float vel[3];
-                                               gLoc[0]=victim->coords.x;
-                                               gLoc[1]=victim->coords.y;
-                                               gLoc[2]=victim->coords.z;
-                                               vel[0]=velocity.x;
-                                               vel[1]=velocity.y;
-                                               vel[2]=velocity.z;
-                                               PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, TRUE);
-                                               FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel);
-                                               FSOUND_SetVolume(channels[clawslicesound], 128);
-                                               FSOUND_SetPaused(channels[clawslicesound], FALSE);
+                                               emit_sound_at(clawslicesound, victim->coords);
                                                victim->spurt=1;
                                                victim->DoBloodBig(1/victim->armorhead,210);
                                        }
-                                       if(id==0){
-                                               bonus=TackleBonus;
-                                               bonustime=0;
-                                               bonusvalue=5;
-                                               if(victim->aitype==gethelptype)bonusvalue=50;
-                                       }
+                                       award_bonus(id, TackleBonus,
+                                                   victim->aitype == gethelptype ? 50 : 0);
                                }
                        }
 
                        if(!drawtogglekeydown&&drawkeydown&&(weaponactive==-1||num_weapons==1)&&(animation[targetanimation].label[targetframe]||(targetanimation!=currentanimation&&currentanimation==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;
 
                                        if(weaponactive==-1){
-                                               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;
-
-                                               PlaySoundEx( knifesheathesound, samp[knifesheathesound], NULL, TRUE);
-                                               FSOUND_3D_SetAttributes(channels[knifesheathesound], gLoc, vel);
-                                               FSOUND_SetVolume(channels[knifesheathesound], 128);
-                                               FSOUND_SetPaused(channels[knifesheathesound], FALSE);   
+                                               emit_sound_at(knifesheathesound, coords);
                                        }
                                        if(weaponactive!=-1){
-                                               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;
-
-                                               PlaySoundEx( knifedrawsound, samp[knifedrawsound], NULL, TRUE);
-                                               FSOUND_3D_SetAttributes(channels[knifedrawsound], gLoc, vel);
-                                               FSOUND_SetVolume(channels[knifedrawsound], 128);
-                                               FSOUND_SetPaused(channels[knifedrawsound], FALSE);      
+                                               emit_sound_at(knifedrawsound, coords, 128);
                                        }
                                }
                                drawtogglekeydown=1;
@@ -2084,14 +1559,6 @@ void     Person::DoAnimations(){
                        if(tutoriallevel!=1||id==0)
                                if((animation[targetanimation].label[targetframe]&&(animation[targetanimation].label[targetframe]<5||animation[targetanimation].label[targetframe]==8))/*||(targetanimation==rollanim&&targetframe==animation[rollanim].numframes-1)*/){
                                        int whichsound;
-                                       float gLoc[3];
-                                       float vel[3];
-                                       gLoc[0]=coords.x;
-                                       gLoc[1]=coords.y;
-                                       gLoc[2]=coords.z;
-                                       vel[0]=velocity.x;
-                                       vel[1]=velocity.y;
-                                       vel[2]=velocity.z;
                                        if(onterrain){
                                                if(terrain.getOpacity(coords.x,coords.z)<.2){
                                                        if(animation[targetanimation].label[targetframe]==1)whichsound=footstepsound;
@@ -2103,11 +1570,11 @@ void    Person::DoAnimations(){
                                                                FootLand(0,1);
                                                        }
 
-                                               }       
+                                               }
                                                if(terrain.getOpacity(coords.x,coords.z)>=.2){
                                                        if(animation[targetanimation].label[targetframe]==1)whichsound=footstepsound3;
                                                        else whichsound=footstepsound4;
-                                               }                       
+                                               }
                                        }
                                        if(!onterrain){
                                                if(animation[targetanimation].label[targetframe]==1)whichsound=footstepsound3;
@@ -2125,12 +1592,7 @@ void     Person::DoAnimations(){
                                        else if(animation[targetanimation].label[targetframe]==4)whichsound=knifeswishsound;
                                        if(animation[targetanimation].label[targetframe]==8&&tutoriallevel!=1)whichsound=landsound2;
 
-                                       PlaySoundEx( whichsound, samp[whichsound], NULL, TRUE);
-                                       FSOUND_3D_SetAttributes(channels[whichsound], gLoc, vel);
-                                       if(whichsound!=knifeswishsound)FSOUND_SetVolume(channels[whichsound], 128);
-                                       if(whichsound!=knifeswishsound&&(targetanimation==staffhitanim||targetanimation==staffgroundsmashanim||targetanimation==staffspinhitanim))FSOUND_SetVolume(channels[whichsound], 256);
-                                       if(whichsound==knifeswishsound)FSOUND_SetVolume(channels[whichsound], 512);
-                                       FSOUND_SetPaused(channels[whichsound], FALSE);
+                                       emit_sound_at(whichsound, coords, 256.);
 
                                        if(id==0)
                                                if(whichsound==footstepsound||whichsound==footstepsound2||whichsound==footstepsound3||whichsound==footstepsound4){
@@ -2143,10 +1605,7 @@ void     Person::DoAnimations(){
 
                                                if(animation[targetanimation].label[targetframe]==3){
                                                        whichsound--;
-                                                       PlaySoundEx( whichsound, samp[whichsound], NULL, TRUE);
-                                                       FSOUND_3D_SetAttributes(channels[whichsound], gLoc, vel);
-                                                       FSOUND_SetVolume(channels[whichsound], 128);
-                                                       FSOUND_SetPaused(channels[whichsound], FALSE);
+                                                       emit_sound_at(whichsound, coords, 128.);
                                                }
                                }
 
@@ -2156,14 +1615,6 @@ void     Person::DoAnimations(){
                                                if(targetanimation!=crouchstabanim&&targetanimation!=swordgroundstabanim&&targetanimation!=staffgroundsmashanim)
                                                        if((animation[targetanimation].label[targetframe]&&(animation[targetanimation].label[targetframe]<5||animation[targetanimation].label[targetframe]==8))/*||(targetanimation==rollanim&&targetframe==animation[rollanim].numframes-1)*/){
                                                                int whichsound=-1;
-                                                               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(animation[targetanimation].label[targetframe]==4&&aitype!=playercontrolled){
                                                                        if(animation[targetanimation].attack!=neutral){
                                                                                i=abs(Random()%4);
@@ -2187,16 +1638,13 @@ void    Person::DoAnimations(){
                                                                //if(animation[targetanimation].label[targetframe]==8)whichsound=landsound2;
 
                                                                if(whichsound!=-1){
-                                                                       PlaySoundEx( whichsound, samp[whichsound], NULL, TRUE);
-                                                                       FSOUND_3D_SetAttributes(channels[whichsound], gLoc, vel);
-                                                                       FSOUND_SetVolume(channels[whichsound], 512);
-                                                                       FSOUND_SetPaused(channels[whichsound], FALSE);
+                                                                       emit_sound_at(whichsound, coords);
                                                                }
                                                        }
 
 
 
-                                                       if((!wasLanding()&&!wasLandhard())&&currentanimation!=getIdle()&&(isLanding()||isLandhard())){                          
+                                                       if((!wasLanding()&&!wasLandhard())&&currentanimation!=getIdle()&&(isLanding()||isLandhard())){
                                                                FootLand(0,1);
                                                                FootLand(1,1);
                                                        }
@@ -2208,27 +1656,16 @@ void    Person::DoAnimations(){
                                                        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){
-                                                                                                       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;
-                                                                                                       PlaySoundEx( knifedrawsound, samp[knifedrawsound], NULL, TRUE);
-                                                                                                       FSOUND_3D_SetAttributes(channels[knifedrawsound], gLoc, vel);
-                                                                                                       FSOUND_SetVolume(channels[knifedrawsound], 128);
-                                                                                                       FSOUND_SetPaused(channels[knifedrawsound], FALSE);
+                                                               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];
                                                                                                }
@@ -2239,50 +1676,34 @@ void    Person::DoAnimations(){
                                                                }
                                                        }
 
-                                                       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){
-                                                                                               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;
-                                                                                               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){
-                                                                                                                       PlaySoundEx( knifedrawsound, samp[knifedrawsound], NULL, TRUE);
-                                                                                                                       FSOUND_3D_SetAttributes(channels[knifedrawsound], gLoc, vel);
-                                                                                                                       FSOUND_SetVolume(channels[knifedrawsound], 128);
-                                                                                                                       FSOUND_SetPaused(channels[knifedrawsound], FALSE);
+                                                                                                                       fleshstuck=true;
                                                                                                                }
                                                                                                        }
                                                                                                        if(fleshstuck){
-                                                                                                               PlaySoundEx( fleshstabremovesound, samp[fleshstabremovesound], NULL, TRUE);
-                                                                                                               FSOUND_3D_SetAttributes(channels[fleshstabremovesound], gLoc, vel);
-                                                                                                               FSOUND_SetVolume(channels[fleshstabremovesound], 128);
-                                                                                                               FSOUND_SetPaused(channels[fleshstabremovesound], FALSE);
+                                                                                                               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;
 
@@ -2302,12 +1723,12 @@ void    Person::DoAnimations(){
                                                                                                                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)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .8, .3);
-                                                                                                                               weapons.bloody[i]=2;
-                                                                                                                               weapons.blooddrip[i]=5;
+                                                                                                                               if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .8, .3);
+                                                                                                                               weapons[i].bloody=2;
+                                                                                                                               weapons[i].blooddrip=5;
                                                                                                                                victim->weaponstuck=-1;
                                                                                                                        }
                                                                                                                }
@@ -2322,7 +1743,7 @@ void      Person::DoAnimations(){
                                                                                                                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];
                                                                                                        }
@@ -2345,47 +1766,23 @@ void    Person::DoAnimations(){
                                                                        }
                                                                }
                                                                if(weaponactive==-1){
-                                                                       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;
-
-                                                                       PlaySoundEx( knifesheathesound, samp[knifesheathesound], NULL, TRUE);
-                                                                       FSOUND_3D_SetAttributes(channels[knifesheathesound], gLoc, vel);
-                                                                       FSOUND_SetVolume(channels[knifesheathesound], 128);
-                                                                       FSOUND_SetPaused(channels[knifesheathesound], FALSE);   
+                                                                       emit_sound_at(knifesheathesound, coords, 128.);
                                                                }
                                                                if(weaponactive!=-1){
-                                                                       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;
-
-                                                                       PlaySoundEx( knifedrawsound, samp[knifedrawsound], NULL, TRUE);
-                                                                       FSOUND_3D_SetAttributes(channels[knifedrawsound], gLoc, vel);
-                                                                       FSOUND_SetVolume(channels[knifedrawsound], 128);
-                                                                       FSOUND_SetPaused(channels[knifedrawsound], FALSE);      
+                                                                       emit_sound_at(knifedrawsound, coords, 128.);
                                                                }
                                                        }
 
 
                                                        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;
@@ -2397,19 +1794,7 @@ void     Person::DoAnimations(){
                                                                if((targetanimation==rabbitrunninganim||targetanimation==wolfrunninganim)&&id==0){
                                                                        targetanimation=rabbittackleanim;
                                                                        targetframe=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;
-
-                                                                       PlaySoundEx( jumpsound, samp[jumpsound], NULL, TRUE);
-                                                                       FSOUND_3D_SetAttributes(channels[jumpsound], gLoc, vel);
-                                                                       FSOUND_SetVolume(channels[jumpsound], 128);
-                                                                       FSOUND_SetPaused(channels[jumpsound], FALSE);
+                                                                       emit_sound_at(jumpsound, coords);
                                                                }
 
                                                                float closestdist;
@@ -2440,24 +1825,12 @@ void    Person::DoAnimations(){
                                                                                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){
-                                                                                       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;
-
-                                                                                       PlaySoundEx( jumpsound, samp[jumpsound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[jumpsound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[jumpsound], 128);
-                                                                                       FSOUND_SetPaused(channels[jumpsound], FALSE);
+                                                                                       emit_sound_at(jumpsound, coords, 128.);
                                                                                }
                                                                        }
                                                        }
@@ -2477,25 +1850,11 @@ void    Person::DoAnimations(){
                                                                                        DoBlood(.2,250);
                                                                                        if(creature==wolftype)DoBloodBig(0,250);
                                                                                }
-                                                                               float gLoc[3];
-                                                                               float vel[3];
-                                                                               gLoc[0]=victim->coords.x;
-                                                                               gLoc[1]=victim->coords.y;
-                                                                               gLoc[2]=victim->coords.z;
-                                                                               vel[0]=velocity.x;
-                                                                               vel[1]=velocity.y;
-                                                                               vel[2]=velocity.z;
                                                                                if(tutoriallevel!=1){
-                                                                                       PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[heavyimpactsound], 128);
-                                                                                       FSOUND_SetPaused(channels[heavyimpactsound], FALSE);
+                                                                                       emit_sound_at(heavyimpactsound, victim->coords, 128.);
                                                                                }
                                                                                if(creature==wolftype){
-                                                                                       PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[clawslicesound], 128);
-                                                                                       FSOUND_SetPaused(channels[clawslicesound], FALSE);
+                                                                                       emit_sound_at(clawslicesound, victim->coords, 128.);
                                                                                        victim->spurt=1;
                                                                                        victim->DoBloodBig(2/victim->armorhead,175);
                                                                                }
@@ -2513,9 +1872,7 @@ void      Person::DoAnimations(){
                                                                                victim->Puff(head);
                                                                                victim->DoDamage(damagemult*100/victim->protectionhead);
 
-                                                                               if(id==0){
-                                                                                       SolidHitBonus();
-                                                                               }
+                                                                               SolidHitBonus(id);
                                                                        }
                                                                }
 
@@ -2527,23 +1884,9 @@ void     Person::DoAnimations(){
                                                                                        victim->spurt=1;
                                                                                        if(creature==wolftype)DoBloodBig(0,235);
                                                                                }
-                                                                               float gLoc[3];
-                                                                               float vel[3];
-                                                                               gLoc[0]=victim->coords.x;
-                                                                               gLoc[1]=victim->coords.y;
-                                                                               gLoc[2]=victim->coords.z;
-                                                                               vel[0]=velocity.x;
-                                                                               vel[1]=velocity.y;
-                                                                               vel[2]=velocity.z;
-                                                                               PlaySoundEx( whooshhitsound, samp[whooshhitsound], NULL, TRUE);
-                                                                               FSOUND_3D_SetAttributes(channels[whooshhitsound], gLoc, vel);
-                                                                               FSOUND_SetVolume(channels[whooshhitsound], 512);
-                                                                               FSOUND_SetPaused(channels[whooshhitsound], FALSE);
+                                                                               emit_sound_at(whooshhitsound, victim->coords);
                                                                                if(creature==wolftype){
-                                                                                       PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[clawslicesound], 128);
-                                                                                       FSOUND_SetPaused(channels[clawslicesound], FALSE);
+                                                                                       emit_sound_at(clawslicesound, victim->coords, 128.);
                                                                                        victim->spurt=1;
                                                                                        victim->DoBloodBig(2,175);
                                                                                }
@@ -2571,25 +1914,11 @@ void    Person::DoAnimations(){
                                                                                if(id==0)camerashake+=.4;
                                                                                victim->spurt=1;
                                                                                DoBlood(.2,250);
-                                                                               float gLoc[3];
-                                                                               float vel[3];
-                                                                               gLoc[0]=victim->coords.x;
-                                                                               gLoc[1]=victim->coords.y;
-                                                                               gLoc[2]=victim->coords.z;
-                                                                               vel[0]=velocity.x;
-                                                                               vel[1]=velocity.y;
-                                                                               vel[2]=velocity.z;
                                                                                if(tutoriallevel!=1){
-                                                                                       PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[heavyimpactsound], 160);
-                                                                                       FSOUND_SetPaused(channels[heavyimpactsound], FALSE);
+                                                                                       emit_sound_at(heavyimpactsound, victim->coords, 160.);
                                                                                }
                                                                                if(creature==wolftype){
-                                                                                       PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[clawslicesound], 128);
-                                                                                       FSOUND_SetPaused(channels[clawslicesound], FALSE);
+                                                                                       emit_sound_at(clawslicesound, victim->coords, 128.);
                                                                                        victim->spurt=1;
                                                                                        victim->DoBloodBig(2/victim->armorhead,175);
                                                                                }
@@ -2607,16 +1936,10 @@ void    Person::DoAnimations(){
                                                                                victim->Puff(head);
                                                                                victim->DoDamage(damagemult*150/victim->protectionhead);
 
-                                                                               if(victim->damage>victim->damagetolerance){
-                                                                                       if(id==0){
-                                                                                               bonus=style;
-                                                                                               bonustime=0;
-                                                                                               bonusvalue=150;
-                                                                                       }
-                                                                               }
-                                                                               else if(id==0){
-                                                                                       SolidHitBonus();
-                                                                               }
+                                                                               if(victim->damage>victim->damagetolerance)
+                                                                                 award_bonus(id, style);
+                                                                               else
+                                                                                 SolidHitBonus(id);
                                                                        }
                                                                }
 
@@ -2626,25 +1949,11 @@ void    Person::DoAnimations(){
                                                                                if(id==0)camerashake+=.4;
                                                                                victim->spurt=1;
                                                                                DoBlood(.2,250);
-                                                                               float gLoc[3];
-                                                                               float vel[3];
-                                                                               gLoc[0]=victim->coords.x;
-                                                                               gLoc[1]=victim->coords.y;
-                                                                               gLoc[2]=victim->coords.z;
-                                                                               vel[0]=velocity.x;
-                                                                               vel[1]=velocity.y;
-                                                                               vel[2]=velocity.z;
                                                                                if(tutoriallevel!=1){
-                                                                                       PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[heavyimpactsound], 160);
-                                                                                       FSOUND_SetPaused(channels[heavyimpactsound], FALSE);
+                                                                                       emit_sound_at(heavyimpactsound, victim->coords, 160.);
                                                                                }
                                                                                if(creature==wolftype){
-                                                                                       PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[clawslicesound], 128);
-                                                                                       FSOUND_SetPaused(channels[clawslicesound], FALSE);
+                                                                                       emit_sound_at(clawslicesound, victim->coords, 128.);
                                                                                        victim->spurt=1;
                                                                                        victim->DoBloodBig(2/victim->armorhead,175);
                                                                                }
@@ -2662,16 +1971,10 @@ void    Person::DoAnimations(){
                                                                                victim->Puff(head);
                                                                                victim->DoDamage(damagemult*150/victim->protectionhead);
 
-                                                                               if(victim->damage>victim->damagetolerance){
-                                                                                       if(id==0){
-                                                                                               bonus=style;
-                                                                                               bonustime=0;
-                                                                                               bonusvalue=150;
-                                                                                       }
-                                                                               }
-                                                                               else if(id==0){
-                                                                                       SolidHitBonus();
-                                                                               }
+                                                                               if(victim->damage>victim->damagetolerance)
+                                                                                 award_bonus(id, style);
+                                                                               else
+                                                                                 SolidHitBonus(id);
                                                                        }
                                                                }
 
@@ -2683,18 +1986,7 @@ void     Person::DoAnimations(){
                                                                                        victim->spurt=1;
                                                                                        DoBlood(.2,235);
                                                                                }
-                                                                               float gLoc[3];
-                                                                               float vel[3];
-                                                                               gLoc[0]=victim->coords.x;
-                                                                               gLoc[1]=victim->coords.y;
-                                                                               gLoc[2]=victim->coords.z;
-                                                                               vel[0]=velocity.x;
-                                                                               vel[1]=velocity.y;
-                                                                               vel[2]=velocity.z;
-                                                                               PlaySoundEx( whooshhitsound, samp[whooshhitsound], NULL, TRUE);
-                                                                               FSOUND_3D_SetAttributes(channels[whooshhitsound], gLoc, vel);
-                                                                               FSOUND_SetVolume(channels[whooshhitsound], 512);
-                                                                               FSOUND_SetPaused(channels[whooshhitsound], FALSE);
+                                                                               emit_sound_at(whooshhitsound, victim->coords);
                                                                                victim->RagDoll(0);
                                                                                XYZ relative;
                                                                                relative=victim->coords-coords;
@@ -2714,23 +2006,7 @@ void     Person::DoAnimations(){
                                                                        if(findDistancefast(&coords,&victim->coords)<(scale*5)*(scale*5)*3&&victim->dead){
                                                                                escapednum=0;
                                                                                if(id==0)camerashake+=.2;
-                                                                               float gLoc[3];
-                                                                               float vel[3];
-                                                                               gLoc[0]=victim->coords.x;
-                                                                               gLoc[1]=victim->coords.y;
-                                                                               gLoc[2]=victim->coords.z;
-                                                                               vel[0]=velocity.x;
-                                                                               vel[1]=velocity.y;
-                                                                               vel[2]=velocity.z;
-                                                                               /*PlaySoundEx( landsound2, samp[landsound2], NULL, TRUE);
-                                                                               FSOUND_3D_SetAttributes(channels[landsound2], gLoc, vel);
-                                                                               FSOUND_SetVolume(channels[landsound2], 128);
-                                                                               FSOUND_SetPaused(channels[landsound2], FALSE);
-                                                                               */
-                                                                               PlaySoundEx( movewhooshsound, samp[movewhooshsound], NULL, TRUE);
-                                                                               FSOUND_3D_SetAttributes(channels[movewhooshsound], gLoc, vel);
-                                                                               FSOUND_SetVolume(channels[movewhooshsound], 128);
-                                                                               FSOUND_SetPaused(channels[movewhooshsound], FALSE);
+                                                                               emit_sound_at(whooshhitsound, victim->coords, 128.);
 
                                                                                victim->skeleton.longdead=0;
                                                                                victim->skeleton.free=1;
@@ -2763,19 +2039,8 @@ void     Person::DoAnimations(){
                                                                        if(findDistancefast(&coords,&victim->coords)<(scale*5)*(scale*5)*9&&victim->dead){
                                                                                escapednum=0;
                                                                                if(id==0)camerashake+=.4;
-                                                                               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(tutoriallevel!=1){
-                                                                                       PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[heavyimpactsound], 128);
-                                                                                       FSOUND_SetPaused(channels[heavyimpactsound], FALSE);
+                                                                                       emit_sound_at(heavyimpactsound, coords, 128.);
                                                                                }
                                                                                XYZ relative;
                                                                                relative=victim->coords-coords;
@@ -2798,19 +2063,8 @@ void     Person::DoAnimations(){
                                                                        if(findDistancefast(&coords,&victim->coords)<(scale*5)*(scale*5)*9&&victim->skeleton.free){
                                                                                escapednum=0;
                                                                                if(id==0)camerashake+=.4;
-                                                                               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(tutoriallevel!=1){
-                                                                                       PlaySoundEx( thudsound, samp[thudsound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[thudsound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[thudsound], 400);
-                                                                                       FSOUND_SetPaused(channels[thudsound], FALSE);
+                                                                                       emit_sound_at(thudsound, coords);
                                                                                }
 
                                                                                victim->skeleton.longdead=0;
@@ -2831,9 +2085,8 @@ void      Person::DoAnimations(){
                                                                                for(i=0;i<victim->skeleton.num_joints;i++){
                                                                                        victim->skeleton.joints[i].velocity+=relative*damagemult*20;
                                                                                }
-                                                                               if(id==0&&!victim->dead){
-                                                                                       SolidHitBonus();
-                                                                               }
+                                                                               if(!victim->dead)
+                                                                                 SolidHitBonus(id);
 
                                                                                victim->Puff(abdomen);
                                                                                victim->DoDamage(damagemult*20/victim->protectionhigh);
@@ -2846,26 +2099,14 @@ void    Person::DoAnimations(){
                                                                }
 
                                                                if((targetanimation==crouchstabanim||targetanimation==swordgroundstabanim)&&animation[targetanimation].label[currentframe]==5){
-                                                                       // if(findDistancefast(&coords,&victim->coords)<(scale*5)*(scale*5)*9){
                                                                        //if(id==0)camerashake+=.4;
-                                                                       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(hasvictim)
                                                                                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);
-                                                                               PlaySoundEx( knifesheathesound, samp[knifesheathesound], NULL, TRUE);
-                                                                               FSOUND_3D_SetAttributes(channels[knifesheathesound], gLoc, vel);
-                                                                               FSOUND_SetVolume(channels[knifesheathesound], 128);
-                                                                               FSOUND_SetPaused(channels[knifesheathesound], FALSE);
+                                                                               terrain.MakeDecal(blooddecalfast,(weapons[weaponids[weaponactive]].tippoint*.8+weapons[weaponids[weaponactive]].position*.2),.08,.6,Random()%360);
+                                                                               emit_sound_at(knifesheathesound, coords, 128.);
                                                                        }
 
                                                                        if(victim&&hasvictim){
@@ -2874,34 +2115,34 @@ void    Person::DoAnimations(){
                                                                                        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;
@@ -2911,13 +2152,10 @@ void    Person::DoAnimations(){
                                                                                        if(whichtri!=-1){
                                                                                                if(victim->dead!=2){
                                                                                                        victim->DoDamage(abs((victim->damagetolerance-victim->permanentdamage)*2));
-                                                                                                       if(id==0&&!victim->dead){
-                                                                                                               bonus=FinishedBonus;
-                                                                                                               bonustime=0;
-                                                                                                               bonusvalue=200;
-                                                                                                       }
+                                                                                                       if (!victim->dead)
+                                                                                                         award_bonus(id, FinishedBonus);
                                                                                                }
-                                                                                               if(bloodtoggle)weapons.bloody[weaponids[weaponactive]]=2;
+                                                                                               if(bloodtoggle)weapons[weaponids[weaponactive]].bloody=2;
 
                                                                                                victim->skeleton.longdead=0;
                                                                                                victim->skeleton.free=1;
@@ -2928,68 +2166,46 @@ void    Person::DoAnimations(){
                                                                                                        victim->skeleton.joints[i].locked=0;
                                                                                                        //victim->skeleton.joints[i].velocity=0;
                                                                                                }
-                                                                                               PlaySoundEx( fleshstabsound, samp[fleshstabsound], NULL, TRUE);
-                                                                                               FSOUND_3D_SetAttributes(channels[fleshstabsound], gLoc, vel);
-                                                                                               FSOUND_SetVolume(channels[fleshstabsound], 128);
-                                                                                               FSOUND_SetPaused(channels[fleshstabsound], FALSE);
+                                                                                               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;
-                                                                                               PlaySoundEx( knifesheathesound, samp[knifesheathesound], NULL, TRUE);
-                                                                                               FSOUND_3D_SetAttributes(channels[knifesheathesound], gLoc, vel);
-                                                                                               FSOUND_SetVolume(channels[knifesheathesound], 128);
-                                                                                               FSOUND_SetPaused(channels[knifesheathesound], FALSE);                                                           
+                                                                                               emit_sound_at(knifesheathesound, coords, 128.);
                                                                                        }
                                                                                }
                                                                        }
                                                                }
 
                                                                if((targetanimation==crouchstabanim||targetanimation==swordgroundstabanim)&&animation[targetanimation].label[currentframe]==6){
-                                                                       // if(findDistancefast(&coords,&victim->coords)<(scale*5)*(scale*5)*9){
-                                                                       //if(id==0)camerashake+=.4;
-                                                                       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(!hasvictim){
-                                                                               PlaySoundEx( knifedrawsound, samp[knifedrawsound], NULL, TRUE);
-                                                                               FSOUND_3D_SetAttributes(channels[knifedrawsound], gLoc, vel);
-                                                                               FSOUND_SetVolume(channels[knifedrawsound], 128);
-                                                                               FSOUND_SetPaused(channels[knifedrawsound], FALSE);                                                      
+                                                                               emit_sound_at(knifedrawsound, coords, 128);
                                                                        }
 
                                                                        if(victim&&hasvictim){
-                                                                               XYZ footvel,footpoint;  
+                                                                               XYZ footvel,footpoint;
 
-                                                                               PlaySoundEx( fleshstabremovesound, samp[fleshstabremovesound], NULL, TRUE);
-                                                                               FSOUND_3D_SetAttributes(channels[fleshstabremovesound], gLoc, vel);
-                                                                               FSOUND_SetVolume(channels[fleshstabremovesound], 128);
-                                                                               FSOUND_SetPaused(channels[fleshstabremovesound], FALSE);
+                                                                               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;
@@ -2998,21 +2214,21 @@ void    Person::DoAnimations(){
                                                                                        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;
@@ -3021,7 +2237,7 @@ void      Person::DoAnimations(){
                                                                                        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);
@@ -3033,7 +2249,7 @@ void      Person::DoAnimations(){
 
                                                                                                for(i=0;i<victim->skeleton.num_joints;i++){
                                                                                                        victim->skeleton.joints[i].velchange=0;
-                                                                                                       victim->skeleton.joints[i].locked=0;                                                            
+                                                                                                       victim->skeleton.joints[i].locked=0;
                                                                                                        //victim->skeleton.joints[i].velocity=0;
                                                                                                }
 
@@ -3042,7 +2258,7 @@ void      Person::DoAnimations(){
                                                                                                relative.y=10;
                                                                                                Normalise(&relative);
                                                                                                //victim->Puff(abdomen);
-                                                                                               if(bloodtoggle)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .8, .3);
+                                                                                               if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .8, .3);
 
                                                                                                if(victim->bloodloss<victim->damagetolerance){
                                                                                                        victim->bloodloss+=1000;
@@ -3054,9 +2270,9 @@ void      Person::DoAnimations(){
                                                                                }
                                                                        }
                                                                        if(!hasvictim&&onterrain){
-                                                                               weapons.bloody[weaponids[weaponactive]]=0;
-                                                                               weapons.blooddrip[weaponids[weaponactive]]=0;
-                                                                       }                                       
+                                                                               weapons[weaponids[weaponactive]].bloody=0;
+                                                                               weapons[weaponids[weaponactive]].blooddrip=0;
+                                                                       }
                                                                }
 
                                                                if(targetanimation==upunchanim&&animation[targetanimation].label[currentframe]==5){
@@ -3067,33 +2283,10 @@ void    Person::DoAnimations(){
                                                                                        victim->spurt=1;
                                                                                        DoBlood(.2,235);
                                                                                }
-                                                                               float gLoc[3];
-                                                                               float vel[3];
-                                                                               gLoc[0]=victim->coords.x;
-                                                                               gLoc[1]=victim->coords.y;
-                                                                               gLoc[2]=victim->coords.z;
-                                                                               vel[0]=velocity.x;
-                                                                               vel[1]=velocity.y;
-                                                                               vel[2]=velocity.z;
-                                                                               //if(!victim->isIdle()||victim->damage>victim->damagetolerance-60){
-                                                                               if(1==1){
-                                                                                       if(tutoriallevel!=1){
-                                                                                               PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, TRUE);
-                                                                                               FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel);
-                                                                                               FSOUND_SetVolume(channels[heavyimpactsound], 128);
-                                                                                               FSOUND_SetPaused(channels[heavyimpactsound], FALSE);
-                                                                                       }
-                                                                               }
-                                                                               else {
-                                                                                       if(tutoriallevel!=1){
-                                                                                               PlaySoundEx( landsound2, samp[landsound2], NULL, TRUE);
-                                                                                               FSOUND_3D_SetAttributes(channels[landsound2], gLoc, vel);
-                                                                                               FSOUND_SetVolume(channels[landsound2], 256);
-                                                                                               FSOUND_SetPaused(channels[landsound2], FALSE);                                                  
-                                                                                       }
+                                                                               if(tutoriallevel!=1){
+                                                                                 emit_sound_at(heavyimpactsound, victim->coords, 128);
                                                                                }
 
-                                                                               //if(!victim->isIdle()||victim->damage>victim->damagetolerance-60)
                                                                                victim->RagDoll(0);
                                                                                XYZ relative;
                                                                                relative=victim->coords-coords;
@@ -3106,7 +2299,7 @@ void      Person::DoAnimations(){
 
                                                                                victim->targetframe=0;
                                                                                victim->targetanimation=staggerbackhardanim;
-                                                                               victim->targetrotation=targetrotation+180;
+                                                                               victim->targetyaw=targetyaw+180;
                                                                                victim->target=0;
                                                                                victim->stunned=1;
 
@@ -3114,9 +2307,7 @@ void      Person::DoAnimations(){
                                                                                victim->Puff(abdomen);
                                                                                victim->DoDamage(damagemult*60/victim->protectionhigh);
 
-                                                                               if(id==0){
-                                                                                       SolidHitBonus();
-                                                                               }
+                                                                               SolidHitBonus(id);
                                                                        }
                                                                }
 
@@ -3125,38 +2316,20 @@ void    Person::DoAnimations(){
                                                                        if(findDistancefast(&coords,&victim->coords)<(scale*5)*(scale*5)*2){
                                                                                escapednum=0;
                                                                                if(id==0)camerashake+=.4;
-                                                                               float gLoc[3];
-                                                                               float vel[3];
-                                                                               gLoc[0]=victim->coords.x;
-                                                                               gLoc[1]=victim->coords.y;
-                                                                               gLoc[2]=victim->coords.z;
-                                                                               vel[0]=velocity.x;
-                                                                               vel[1]=velocity.y;
-                                                                               vel[2]=velocity.z;
-                                                                               //if(!victim->isIdle()||victim->damage>victim->damagetolerance-60){
                                                                                if(victim->damage<=victim->damagetolerance-60&&normaldotproduct(victim->facing,victim->coords-coords)<(scale*5)*(scale*5)*0&&animation[victim->targetanimation].height!=lowheight){
                                                                                        if(tutoriallevel!=1){
-                                                                                               PlaySoundEx( thudsound, samp[thudsound], NULL, TRUE);
-                                                                                               FSOUND_3D_SetAttributes(channels[thudsound], gLoc, vel);
-                                                                                               FSOUND_SetVolume(channels[thudsound], 512);
-                                                                                               FSOUND_SetPaused(channels[thudsound], FALSE);
+                                                                                               emit_sound_at(thudsound, victim->coords);
                                                                                        }
                                                                                }
                                                                                else if(victim->damage<=victim->damagetolerance-60&&normaldotproduct(victim->facing,victim->coords-coords)<(scale*5)*(scale*5)*0&&animation[victim->targetanimation].height==lowheight){
                                                                                        if(tutoriallevel!=1){
-                                                                                               PlaySoundEx( whooshhitsound, samp[whooshhitsound], NULL, TRUE);
-                                                                                               FSOUND_3D_SetAttributes(channels[whooshhitsound], gLoc, vel);
-                                                                                               FSOUND_SetVolume(channels[whooshhitsound], 512);
-                                                                                               FSOUND_SetPaused(channels[whooshhitsound], FALSE);
+                                                                                               emit_sound_at(whooshhitsound, victim->coords);
                                                                                        }
                                                                                }
                                                                                else {
                                                                                        if(tutoriallevel!=1){
-                                                                                               PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, TRUE);
-                                                                                               FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel);
-                                                                                               FSOUND_SetVolume(channels[heavyimpactsound], 256);
-                                                                                               FSOUND_SetPaused(channels[heavyimpactsound], FALSE);
-                                                                                       }                                                       
+                                                                                               emit_sound_at(heavyimpactsound, victim->coords);
+                                                                                       }
                                                                                }
 
                                                                                if(victim->damage>victim->damagetolerance-60||normaldotproduct(victim->facing,victim->coords-coords)>0||animation[victim->targetanimation].height==lowheight)
@@ -3174,35 +2347,21 @@ void    Person::DoAnimations(){
 
                                                                                victim->targetframe=0;
                                                                                victim->targetanimation=staggerbackhardanim;
-                                                                               victim->targetrotation=targetrotation+180;
+                                                                               victim->targetyaw=targetyaw+180;
                                                                                victim->target=0;
                                                                                victim->stunned=1;
 
                                                                                victim->Puff(abdomen);
                                                                                victim->DoDamage(damagemult*60/victim->protectionhigh);
 
-                                                                               if(id==0){
-                                                                                       SolidHitBonus();
-                                                                               }
+                                                                               SolidHitBonus(id);
                                                                        }
                                                                }
 
                                                                if(targetanimation==blockhighleftanim&&animation[targetanimation].label[currentframe]==5){
                                                                        if(findDistancefast(&coords,&victim->coords)<(scale*5)*(scale*5)*4){
                                                                                if(victim->id==0)camerashake+=.4;
-                                                                               float gLoc[3];
-                                                                               float vel[3];
-                                                                               gLoc[0]=victim->coords.x;
-                                                                               gLoc[1]=victim->coords.y;
-                                                                               gLoc[2]=victim->coords.z;
-                                                                               vel[0]=velocity.x;
-                                                                               vel[1]=velocity.y;
-                                                                               vel[2]=velocity.z;
-
-                                                                               PlaySoundEx( landsound2, samp[landsound2], NULL, TRUE);
-                                                                               FSOUND_3D_SetAttributes(channels[landsound2], gLoc, vel);
-                                                                               FSOUND_SetVolume(channels[landsound2], 256);
-                                                                               FSOUND_SetPaused(channels[landsound2], FALSE);
+                                                                               emit_sound_at(landsound2, victim->coords);
 
                                                                                Puff(righthand);
                                                                        }
@@ -3211,30 +2370,16 @@ void    Person::DoAnimations(){
                                                                if(targetanimation==swordslashparryanim&&animation[targetanimation].label[currentframe]==5){
                                                                        if(findDistancefast(&coords,&victim->coords)<(scale*5)*(scale*5)*4){
                                                                                if(victim->id==0)camerashake+=.4;
-                                                                               float gLoc[3];
-                                                                               float vel[3];
-                                                                               gLoc[0]=victim->coords.x;
-                                                                               gLoc[1]=victim->coords.y;
-                                                                               gLoc[2]=victim->coords.z;
-                                                                               vel[0]=velocity.x;
-                                                                               vel[1]=velocity.y;
-                                                                               vel[2]=velocity.z;
 
                                                                                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;
-
-                                                                                               PlaySoundEx( swordstaffsound, samp[swordstaffsound], NULL, TRUE);
-                                                                                               FSOUND_3D_SetAttributes(channels[swordstaffsound], gLoc, vel);
-                                                                                               FSOUND_SetVolume(channels[swordstaffsound], 512);
-                                                                                               FSOUND_SetPaused(channels[swordstaffsound], FALSE);
+                                                                                       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{
-                                                                                               PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, TRUE);
-                                                                                               FSOUND_3D_SetAttributes(channels[metalhitsound], gLoc, vel);
-                                                                                               FSOUND_SetVolume(channels[metalhitsound], 512);
-                                                                                               FSOUND_SetPaused(channels[metalhitsound], FALSE);
+                                                                                               emit_sound_at(metalhitsound, victim->coords);
                                                                                        }
                                                                                }
 
@@ -3246,60 +2391,43 @@ void    Person::DoAnimations(){
                                                                        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];
                                                                                }
                                                                                weaponactive=-1;
-                                                                       }               
+                                                                       }
                                                                }
 
                                                                if(targetanimation==knifeslashstartanim&&animation[targetanimation].label[currentframe]==5){
                                                                        if(hasvictim)
                                                                                if(findDistancefast(&coords,&victim->coords)<(scale*5)*(scale*5)*4.5&&/*animation[victim->targetanimation].height!=lowheight&&*/victim->targetanimation!=dodgebackanim&&victim->targetanimation!=rollanim){
                                                                                        escapednum=0;
-                                                                                       //if(Random()%2){
                                                                                        if(tutoriallevel!=1)victim->DoBloodBig(1.5/victim->armorhigh,225);
-                                                                                       //}
 
-                                                                                       if(id==0){
-                                                                                               bonus=Slicebonus;
-                                                                                               bonustime=0;
-                                                                                               bonusvalue=10;
-                                                                                       }
+                                                                                       award_bonus(id, Slicebonus);
                                                                                        if(tutoriallevel!=1){
-                                                                                               float gLoc[3];
-                                                                                               float vel[3];
-                                                                                               gLoc[0]=victim->coords.x;
-                                                                                               gLoc[1]=victim->coords.y;
-                                                                                               gLoc[2]=victim->coords.z;
-                                                                                               vel[0]=velocity.x;
-                                                                                               vel[1]=velocity.y;
-                                                                                               vel[2]=velocity.z;
-                                                                                               PlaySoundEx( knifeslicesound, samp[knifeslicesound], NULL, TRUE);
-                                                                                               FSOUND_3D_SetAttributes(channels[knifeslicesound], gLoc, vel);
-                                                                                               FSOUND_SetVolume(channels[knifeslicesound], 512);
-                                                                                               FSOUND_SetPaused(channels[knifeslicesound], FALSE);
+                                                                                               emit_sound_at(knifeslicesound, victim->coords);
                                                                                        }
                                                                                        //victim->skeleton.joints[victim->skeleton.jointlabels[abdomen]].velocity+=relative*damagemult*200;
                                                                                        if(animation[victim->targetanimation].attack&&(victim->aitype!=playercontrolled||victim->targetanimation==knifeslashstartanim)&&(victim->creature==rabbittype||victim->deathbleeding<=0)){
                                                                                                if(victim->id != 0 || difficulty==2){
                                                                                                        victim->targetframe=0;
                                                                                                        victim->targetanimation=staggerbackhardanim;
-                                                                                                       victim->targetrotation=targetrotation+180;
+                                                                                                       victim->targetyaw=targetyaw+180;
                                                                                                        victim->target=0;
                                                                                                }
                                                                                        }
@@ -3307,28 +2435,28 @@ void    Person::DoAnimations(){
                                                                                        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;  
+                                                                                       XYZ footvel,footpoint;
                                                                                        footvel=0;
                                                                                        if(skeleton.free){
                                                                                                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)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .6, .3);
+                                                                                               if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .6, .3);
                                                                                                footvel=DoRotation(facing,0,90,0)*.8;
                                                                                                //footvel.y-=.3;
-                                                                                               sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9);
-                                                                                               sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9);
-                                                                                               sprites.MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .2, 1);
-                                                                                               sprites.MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .2, 1);
+                                                                                               Sprite::MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9);
+                                                                                               Sprite::MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9);
+                                                                                               Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .2, 1);
+                                                                                               Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .2, 1);
                                                                                        }
                                                                                        if(tutoriallevel==1){
-                                                                                               sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,1,1, .6, .3);
+                                                                                               Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,1,1, .6, .3);
                                                                                        }
                                                                                        victim->DoDamage(damagemult*0);
                                                                                }
@@ -3336,44 +2464,25 @@ void    Person::DoAnimations(){
                                                                if(targetanimation==swordslashanim&&animation[targetanimation].label[currentframe]==5&&victim->targetanimation!=rollanim){
                                                                        if(findDistancefast(&coords,&victim->coords)<(scale*5)*(scale*5)*6.5&&victim->targetanimation!=dodgebackanim){
                                                                                if(victim->weaponactive==-1||normaldotproduct(victim->facing,victim->coords-coords)>0||(Random()%2==0)){
-                                                                                       if(id==0){
-                                                                                               bonus=Slashbonus;
-                                                                                               bonustime=0;
-                                                                                               bonusvalue=40;
-                                                                                       }
-                                                                                       escapednum=0; 
+                                                                                       award_bonus(id, Slashbonus);
+                                                                                       escapednum=0;
                                                                                        if(tutoriallevel!=1){
                                                                                                if(normaldotproduct(victim->facing,victim->coords-coords)<0)victim->DoBloodBig(2/victim->armorhigh,190);
                                                                                                else victim->DoBloodBig(2/victim->armorhigh,185);
                                                                                                victim->deathbleeding=1;
-                                                                                               float gLoc[3];
-                                                                                               float vel[3];
-                                                                                               gLoc[0]=victim->coords.x;
-                                                                                               gLoc[1]=victim->coords.y;
-                                                                                               gLoc[2]=victim->coords.z;
-                                                                                               vel[0]=velocity.x;
-                                                                                               vel[1]=velocity.y;
-                                                                                               vel[2]=velocity.z;
-                                                                                               PlaySoundEx( swordslicesound, samp[swordslicesound], NULL, TRUE);
-                                                                                               FSOUND_3D_SetAttributes(channels[swordslicesound], gLoc, vel);
-                                                                                               FSOUND_SetVolume(channels[swordslicesound], 512);
-                                                                                               FSOUND_SetPaused(channels[swordslicesound], FALSE);
+                                                                                               emit_sound_at(swordslicesound, victim->coords);
                                                                                        }
                                                                                        //victim->skeleton.joints[victim->skeleton.jointlabels[abdomen]].velocity+=relative*damagemult*200;
-                                                                                       //if(animation[victim->targetanimation].attack){
-                                                                                       //if(victim->creature==rabbittype){
                                                                                        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;
@@ -3381,49 +2490,33 @@ void    Person::DoAnimations(){
                                                                                                //victim->bloodloss+=100*(6.5-findDistancefast(&coords,&victim->coords));
                                                                                                victim->DoDamage(damagemult*0);
 
-                                                                                               XYZ footvel,footpoint;  
+                                                                                               XYZ footvel,footpoint;
                                                                                                footvel=0;
                                                                                                if(skeleton.free){
                                                                                                        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;
-                                                                                               }               
-                                                                                               if(bloodtoggle)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3);
+                                                                                                       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;
                                                                                                footvel.y-=.3;
-                                                                                               sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9);
-                                                                                               sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9);
-                                                                                               sprites.MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .3, 1);
-                                                                                               sprites.MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .3, 1);
+                                                                                               Sprite::MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9);
+                                                                                               Sprite::MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9);
+                                                                                               Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .3, 1);
+                                                                                               Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .3, 1);
                                                                                        }
                                                                                }
                                                                                else {
-
-
-                                                                                       float gLoc[3];
-                                                                                       float vel[3];
-                                                                                       gLoc[0]=victim->coords.x;
-                                                                                       gLoc[1]=victim->coords.y;
-                                                                                       gLoc[2]=victim->coords.z;
-                                                                                       vel[0]=velocity.x;
-                                                                                       vel[1]=velocity.y;
-                                                                                       vel[2]=velocity.z;
                                                                                        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;
-
-                                                                                                       PlaySoundEx( swordstaffsound, samp[swordstaffsound], NULL, TRUE);
-                                                                                                       FSOUND_3D_SetAttributes(channels[swordstaffsound], gLoc, vel);
-                                                                                                       FSOUND_SetVolume(channels[swordstaffsound], 512);
-                                                                                                       FSOUND_SetPaused(channels[swordstaffsound], FALSE);
+                                                                                               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{
-                                                                                                       PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, TRUE);
-                                                                                                       FSOUND_3D_SetAttributes(channels[metalhitsound], gLoc, vel);
-                                                                                                       FSOUND_SetVolume(channels[metalhitsound], 512);
-                                                                                                       FSOUND_SetPaused(channels[metalhitsound], FALSE);
+                                                                                                       emit_sound_at(metalhitsound, victim->coords);
                                                                                                }
                                                                                        }
 
@@ -3433,18 +2526,18 @@ void    Person::DoAnimations(){
                                                                                        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];
@@ -3455,11 +2548,6 @@ void     Person::DoAnimations(){
                                                                                                player[i].wentforweapon=0;
                                                                                        }
 
-                                                                                       /*PlaySoundEx( metalhitsound, samp[metalhitsound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[metalhitsound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[metalhitsound], 512);
-                                                                                       FSOUND_SetPaused(channels[metalhitsound], FALSE);*/
-
                                                                                }
                                                                        }
                                                                }
@@ -3467,24 +2555,13 @@ void    Person::DoAnimations(){
                                                                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){
                                                                                                victim->spurt=1;
                                                                                        }
-                                                                                       float gLoc[3];
-                                                                                       float vel[3];
-                                                                                       gLoc[0]=victim->coords.x;
-                                                                                       gLoc[1]=victim->coords.y;
-                                                                                       gLoc[2]=victim->coords.z;
-                                                                                       vel[0]=velocity.x;
-                                                                                       vel[1]=velocity.y;
-                                                                                       vel[2]=velocity.z;
-                                                                                       PlaySoundEx( staffheadsound, samp[staffheadsound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[staffheadsound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[staffheadsound], 256);
-                                                                                       FSOUND_SetPaused(channels[staffheadsound], FALSE);
+                                                                                       emit_sound_at(staffheadsound, victim->coords);
                                                                                }
                                                                                victim->RagDoll(0);
                                                                                XYZ relative;
@@ -3504,11 +2581,7 @@ void     Person::DoAnimations(){
                                                                                if(tutoriallevel!=1){
                                                                                        victim->DoDamage(damagemult*120/victim->protectionhigh);
 
-                                                                                       if(id==0){
-                                                                                               bonus=solidhit;
-                                                                                               bonustime=0;
-                                                                                               bonusvalue=30;
-                                                                                       }
+                                                                                       award_bonus(id, solidhit, 30);
                                                                                }
                                                                        }
                                                                }
@@ -3516,24 +2589,13 @@ void    Person::DoAnimations(){
                                                                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){
                                                                                                victim->spurt=1;
                                                                                        }
-                                                                                       float gLoc[3];
-                                                                                       float vel[3];
-                                                                                       gLoc[0]=victim->coords.x;
-                                                                                       gLoc[1]=victim->coords.y;
-                                                                                       gLoc[2]=victim->coords.z;
-                                                                                       vel[0]=velocity.x;
-                                                                                       vel[1]=velocity.y;
-                                                                                       vel[2]=velocity.z;
-                                                                                       PlaySoundEx( staffheadsound, samp[staffheadsound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[staffheadsound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[staffheadsound], 256);
-                                                                                       FSOUND_SetPaused(channels[staffheadsound], FALSE);
+                                                                                       emit_sound_at(staffheadsound, victim->coords);
                                                                                }
                                                                                victim->RagDoll(0);
                                                                                XYZ relative;
@@ -3550,11 +2612,7 @@ void     Person::DoAnimations(){
                                                                                victim->Puff(head);
                                                                                if(tutoriallevel!=1){victim->DoDamage(damagemult*350/victim->protectionhead);
 
-                                                                               if(id==0){
-                                                                                       bonus=solidhit;
-                                                                                       bonustime=0;
-                                                                                       bonusvalue=60;
-                                                                               }
+                                                                               award_bonus(id, solidhit, 60);
                                                                                }
                                                                        }
                                                                }
@@ -3563,23 +2621,12 @@ void    Person::DoAnimations(){
                                                                        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;
                                                                                        }
-                                                                                       float gLoc[3];
-                                                                                       float vel[3];
-                                                                                       gLoc[0]=victim->coords.x;
-                                                                                       gLoc[1]=victim->coords.y;
-                                                                                       gLoc[2]=victim->coords.z;
-                                                                                       vel[0]=velocity.x;
-                                                                                       vel[1]=velocity.y;
-                                                                                       vel[2]=velocity.z;
-                                                                                       PlaySoundEx( staffbodysound, samp[staffbodysound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[staffbodysound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[staffbodysound], 256);
-                                                                                       FSOUND_SetPaused(channels[staffbodysound], FALSE);
+                                                                                       emit_sound_at(staffbodysound, victim->coords);
                                                                                }
                                                                                victim->skeleton.longdead=0;
                                                                                victim->skeleton.free=1;
@@ -3587,7 +2634,7 @@ void      Person::DoAnimations(){
 
                                                                                for(i=0;i<victim->skeleton.num_joints;i++){
                                                                                        victim->skeleton.joints[i].velchange=0;
-                                                                                       victim->skeleton.joints[i].locked=0;                                                            
+                                                                                       victim->skeleton.joints[i].locked=0;
                                                                                        //victim->skeleton.joints[i].velocity=0;
                                                                                }
 
@@ -3618,11 +2665,7 @@ void     Person::DoAnimations(){
                                                                                if(tutoriallevel!=1){victim->DoDamage(damagemult*100/victim->protectionhigh);
 
                                                                                if(!victim->dead){
-                                                                                       if(id==0){
-                                                                                               bonus=solidhit;
-                                                                                               bonustime=0;
-                                                                                               bonusvalue=40;
-                                                                                       }
+                                                                                 award_bonus(id, solidhit, 40);
                                                                                }
                                                                                }
                                                                        }
@@ -3632,22 +2675,12 @@ void    Person::DoAnimations(){
                                                                        if(findDistancefast(&coords,&victim->coords)<(scale*5)*(scale*5)*3&&animation[victim->targetanimation].height!=highheight){
                                                                                escapednum=0;
                                                                                if(id==0)camerashake+=.4;
-                                                                               float gLoc[3];
-                                                                               float vel[3];
-                                                                               gLoc[0]=victim->coords.x;
-                                                                               gLoc[1]=victim->coords.y;
-                                                                               gLoc[2]=victim->coords.z;
-                                                                               vel[0]=velocity.x;
-                                                                               vel[1]=velocity.y;
-                                                                               vel[2]=velocity.z;
                                                                                XYZ relative;
                                                                                relative=victim->coords-coords;
                                                                                relative.y=0;
                                                                                Normalise(&relative);
 
-                                                                               if(id==0){
-                                                                                       SolidHitBonus();
-                                                                               }
+                                                                               SolidHitBonus(id);
 
                                                                                if(animation[victim->targetanimation].height==lowheight){
                                                                                        if(Random()%2){
@@ -3660,19 +2693,13 @@ void    Person::DoAnimations(){
                                                                                        }
                                                                                        victim->skeleton.joints[victim->skeleton.jointlabels[head]].velocity+=relative*damagemult*200;
                                                                                        if(tutoriallevel!=1){
-                                                                                               PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, TRUE);
-                                                                                               FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel);
-                                                                                               FSOUND_SetVolume(channels[heavyimpactsound], 128);
-                                                                                               FSOUND_SetPaused(channels[heavyimpactsound], FALSE);
+                                                                                               emit_sound_at(heavyimpactsound, victim->coords, 128.);
                                                                                        }
                                                                                        victim->Puff(head);
                                                                                        victim->DoDamage(damagemult*100/victim->protectionhead);
                                                                                        if(victim->howactive==typesleeping)victim->DoDamage(damagemult*150/victim->protectionhead);
                                                                                        if(creature==wolftype){
-                                                                                               PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, TRUE);
-                                                                                               FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel);
-                                                                                               FSOUND_SetVolume(channels[clawslicesound], 128);
-                                                                                               FSOUND_SetPaused(channels[clawslicesound], FALSE);
+                                                                                               emit_sound_at(clawslicesound, victim->coords, 128.);
                                                                                                victim->spurt=1;
                                                                                                victim->DoBloodBig(2/victim->armorhead,175);
                                                                                        }
@@ -3685,21 +2712,15 @@ void    Person::DoAnimations(){
                                                                                        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){
-                                                                                               PlaySoundEx( landsound2, samp[landsound2], NULL, TRUE);
-                                                                                               FSOUND_3D_SetAttributes(channels[landsound2], gLoc, vel);
-                                                                                               FSOUND_SetVolume(channels[landsound2], 128);
-                                                                                               FSOUND_SetPaused(channels[landsound2], FALSE);
+                                                                                               emit_sound_at(landsound2, victim->coords, 128.);
                                                                                        }
                                                                                        victim->Puff(abdomen);
                                                                                        victim->DoDamage(damagemult*30/victim->protectionhigh);
                                                                                        if(creature==wolftype){
-                                                                                               PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, TRUE);
-                                                                                               FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel);
-                                                                                               FSOUND_SetVolume(channels[clawslicesound], 128);
-                                                                                               FSOUND_SetPaused(channels[clawslicesound], FALSE);
+                                                                                               emit_sound_at(clawslicesound, victim->coords, 128.);
                                                                                                victim->spurt=1;
                                                                                                victim->DoBloodBig(2/victim->armorhigh,170);
                                                                                        }
@@ -3712,19 +2733,8 @@ void     Person::DoAnimations(){
                                                                        if(victim->targetanimation!=jumpupanim&&findDistancefast(&coords,&victim->coords)<(scale*5)*(scale*5)*3&&victim!=this){
                                                                                escapednum=0;
                                                                                if(id==0)camerashake+=.2;
-                                                                               float gLoc[3];
-                                                                               float vel[3];
-                                                                               gLoc[0]=victim->coords.x;
-                                                                               gLoc[1]=victim->coords.y;
-                                                                               gLoc[2]=victim->coords.z;
-                                                                               vel[0]=velocity.x;
-                                                                               vel[1]=velocity.y;
-                                                                               vel[2]=velocity.z;
                                                                                if(tutoriallevel!=1){
-                                                                                       PlaySoundEx( landsound2, samp[landsound2], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[landsound2], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[landsound2], 128);
-                                                                                       FSOUND_SetPaused(channels[landsound2], FALSE);
+                                                                                       emit_sound_at(landsound2, victim->coords, 128.);
                                                                                }
                                                                                XYZ relative;
                                                                                relative=victim->coords-coords;
@@ -3760,25 +2770,20 @@ void    Person::DoAnimations(){
                                                                                        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){
-                                                                                               PlaySoundEx( landsound2, samp[landsound2], NULL, TRUE);
-                                                                                               FSOUND_3D_SetAttributes(channels[landsound2], gLoc, vel);
-                                                                                               FSOUND_SetVolume(channels[landsound2], 128);
-                                                                                               FSOUND_SetPaused(channels[landsound2], FALSE);
+                                                                                               emit_sound_at(landsound2, victim->coords, 128.);
                                                                                        }
                                                                                        victim->Puff(abdomen);
                                                                                        victim->DoDamage(damagemult*30/victim->protectionlow);
                                                                                }
 
-                                                                               if(id==0){
-                                                                                       SolidHitBonus();
-                                                                               }
+                                                                               SolidHitBonus(id);
 
                                                                        }
                                                                }
-                                                       }                               
+                                                       }
                                                        if(animation[targetanimation].attack==reversal&&(!victim->feint||(victim->lastattack==victim->lastattack2&&victim->lastattack2==victim->lastattack3&&Random()%2)||targetanimation==knifefollowanim)){
                                                                if(targetanimation==spinkickreversalanim&&animation[targetanimation].label[currentframe]==7){
                                                                        escapednum=0;
@@ -3787,25 +2792,11 @@ void    Person::DoAnimations(){
                                                                                victim->spurt=1;
                                                                                DoBlood(.2,230);
                                                                        }
-                                                                       float gLoc[3];
-                                                                       float vel[3];
-                                                                       gLoc[0]=victim->coords.x;
-                                                                       gLoc[1]=victim->coords.y;
-                                                                       gLoc[2]=victim->coords.z;
-                                                                       vel[0]=velocity.x;
-                                                                       vel[1]=velocity.y;
-                                                                       vel[2]=velocity.z;
                                                                        if(tutoriallevel!=1){
-                                                                               PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, TRUE);
-                                                                               FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel);
-                                                                               FSOUND_SetVolume(channels[heavyimpactsound], 128);
-                                                                               FSOUND_SetPaused(channels[heavyimpactsound], FALSE);
+                                                                               emit_sound_at(heavyimpactsound, victim->coords, 128.);
                                                                        }
                                                                        if(creature==wolftype){
-                                                                               PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, TRUE);
-                                                                               FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel);
-                                                                               FSOUND_SetVolume(channels[clawslicesound], 128);
-                                                                               FSOUND_SetPaused(channels[clawslicesound], FALSE);
+                                                                               emit_sound_at(clawslicesound, victim->coords, 128);
                                                                                victim->spurt=1;
                                                                                victim->DoBloodBig(2/victim->armorhigh,170);
                                                                        }
@@ -3823,17 +2814,13 @@ void    Person::DoAnimations(){
                                                                        victim->Puff(abdomen);
                                                                        victim->DoDamage(damagemult*150/victim->protectionhigh);
 
-                                                                       if(id==0){
-                                                                               bonus=Reversal;
-                                                                               bonustime=0;
-                                                                               bonusvalue=60;
-                                                                       }
+                                                                       award_bonus(id, Reversal);
                                                                }
 
                                                                if((targetanimation==swordslashreversalanim||targetanimation==knifeslashreversalanim||targetanimation==staffhitreversalanim||targetanimation==staffspinhitreversalanim)&&animation[targetanimation].label[currentframe]==5){
                                                                        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];
@@ -3857,18 +2844,7 @@ void     Person::DoAnimations(){
                                                                                victim->spurt=1;
                                                                                DoBlood(.2,230);
                                                                        }
-                                                                       float gLoc[3];
-                                                                       float vel[3];
-                                                                       gLoc[0]=victim->coords.x;
-                                                                       gLoc[1]=victim->coords.y;
-                                                                       gLoc[2]=victim->coords.z;
-                                                                       vel[0]=velocity.x;
-                                                                       vel[1]=velocity.y;
-                                                                       vel[2]=velocity.z;
-                                                                       PlaySoundEx( whooshhitsound, samp[whooshhitsound], NULL, TRUE);
-                                                                       FSOUND_3D_SetAttributes(channels[whooshhitsound], gLoc, vel);
-                                                                       FSOUND_SetVolume(channels[whooshhitsound], 128);
-                                                                       FSOUND_SetPaused(channels[whooshhitsound], FALSE);
+                                                                       emit_sound_at(whooshhitsound, victim->coords, 128.);
                                                                        victim->RagDoll(0);
                                                                        XYZ relative;
                                                                        relative=victim->coords-oldcoords;
@@ -3891,33 +2867,14 @@ void    Person::DoAnimations(){
                                                                                victim->spurt=1;
                                                                                DoBlood(.2,230);
                                                                        }
-                                                                       float gLoc[3];
-                                                                       float vel[3];
-                                                                       gLoc[0]=victim->coords.x;
-                                                                       gLoc[1]=victim->coords.y;
-                                                                       gLoc[2]=victim->coords.z;
-                                                                       vel[0]=velocity.x;
-                                                                       vel[1]=velocity.y;
-                                                                       vel[2]=velocity.z;
 
-                                                                       if(id==0){
-                                                                               bonus=staffreversebonus;
-                                                                               bonustime=0;
-                                                                               bonusvalue=100;
-                                                                       }
+                                                                       award_bonus(id, staffreversebonus);
 
                                                                        if(tutoriallevel!=1){
-                                                                               PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, TRUE);
-                                                                               FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel);
-                                                                               FSOUND_SetVolume(channels[heavyimpactsound], 128);
-                                                                               FSOUND_SetPaused(channels[heavyimpactsound], FALSE);
+                                                                               emit_sound_at(heavyimpactsound, victim->coords, 128.);
                                                                        }
                                                                        victim->RagDoll(0);
-                                                                       if(id==0){
-                                                                               bonus=staffreversebonus;
-                                                                               bonustime=0;
-                                                                               bonusvalue=100;
-                                                                       }
+                                                                       award_bonus(id, staffreversebonus); // Huh, again?
 
                                                                        XYZ relative;
                                                                        relative=victim->coords-oldcoords;
@@ -3957,39 +2914,21 @@ void    Person::DoAnimations(){
                                                                        victim->Puff(abdomen);
                                                                        victim->DoDamage(damagemult*90/victim->protectionhigh);
 
-                                                                       if(id==0){
-                                                                               bonus=Reversal;
-                                                                               bonustime=0;
-                                                                               bonusvalue=60;
-                                                                       }
+                                                                       award_bonus(id, Reversal);
 
                                                                        bool doslice;
                                                                        doslice=0;
                                                                        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){
-                                                                               float gLoc[3];
-                                                                               float vel[3];
-                                                                               gLoc[0]=victim->coords.x;
-                                                                               gLoc[1]=victim->coords.y;
-                                                                               gLoc[2]=victim->coords.z;
-                                                                               vel[0]=velocity.x;
-                                                                               vel[1]=velocity.y;
-                                                                               vel[2]=velocity.z;
                                                                                if(weaponactive!=-1){
                                                                                        victim->DoBloodBig(2/victim->armorhigh,225);
-                                                                                       PlaySoundEx( knifeslicesound, samp[knifeslicesound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[knifeslicesound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[knifeslicesound], 512);
-                                                                                       FSOUND_SetPaused(channels[knifeslicesound], FALSE);
-                                                                                       if(bloodtoggle&&!weapons.bloody[weaponids[weaponactive]])weapons.bloody[weaponids[weaponactive]]=1;
-                                                                                       weapons.blooddrip[weaponids[weaponactive]]+=3;
+                                                                                       emit_sound_at(knifeslicesound, victim->coords);
+                                                                                       if(bloodtoggle&&!weapons[weaponids[weaponactive]].bloody)weapons[weaponids[weaponactive]].bloody=1;
+                                                                                       weapons[weaponids[weaponactive]].blooddrip+=3;
                                                                                }
-                                                                               if(weaponactive==-1&&creature==wolftype){
-                                                                                       PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[clawslicesound], 128);
-                                                                                       FSOUND_SetPaused(channels[clawslicesound], FALSE);
+                                                                               if(weaponactive==-1&&creature==wolftype){;
+                                                                                       emit_sound_at(clawslicesound, victim->coords, 128.);
                                                                                        victim->spurt=1;
                                                                                        victim->DoBloodBig(2/victim->armorhigh,175);
                                                                                }
@@ -4019,30 +2958,7 @@ void     Person::DoAnimations(){
                                                                        victim->skeleton.joints[victim->skeleton.jointlabels[rightelbow]].velocity*=.5-1;
                                                                        victim->skeleton.joints[victim->skeleton.jointlabels[rightshoulder]].velocity*=.7-1;
 
-                                                                       if(id==0){
-                                                                               bonus=swordreversebonus;
-                                                                               bonustime=0;
-                                                                               bonusvalue=100;
-                                                                       }
-                                                                       //victim->DoDamage(90);
-
-                                                                       /*if(weaponactive!=-1){
-                                                                       float gLoc[3];
-                                                                       float vel[3];
-                                                                       gLoc[0]=victim->coords.x;
-                                                                       gLoc[1]=victim->coords.y;
-                                                                       gLoc[2]=victim->coords.z;
-                                                                       vel[0]=velocity.x;
-                                                                       vel[1]=velocity.y;
-                                                                       vel[2]=velocity.z;
-                                                                       victim->DoBloodBig(2,225);
-                                                                       PlaySoundEx( knifeslicesound, samp[knifeslicesound], NULL, TRUE);
-                                                                       FSOUND_3D_SetAttributes(channels[knifeslicesound], gLoc, vel);
-                                                                       FSOUND_SetVolume(channels[knifeslicesound], 512);
-                                                                       FSOUND_SetPaused(channels[knifeslicesound], FALSE);
-                                                                       if(bloodtoggle&&!weapons.bloody[weaponids[weaponactive]])weapons.bloody[weaponids[weaponactive]]=1;
-                                                                       weapons.blooddrip[weaponids[weaponactive]]+=3;
-                                                                       }*/
+                                                                       award_bonus(id, swordreversebonus);
                                                                }
 
                                                                if(hasvictim&&targetanimation==knifeslashreversalanim&&animation[targetanimation].label[currentframe]==7){
@@ -4052,19 +2968,8 @@ void     Person::DoAnimations(){
                                                                                victim->spurt=1;
                                                                                DoBlood(.2,230);
                                                                        }
-                                                                       float gLoc[3];
-                                                                       float vel[3];
-                                                                       gLoc[0]=victim->coords.x;
-                                                                       gLoc[1]=victim->coords.y;
-                                                                       gLoc[2]=victim->coords.z;
-                                                                       vel[0]=velocity.x;
-                                                                       vel[1]=velocity.y;
-                                                                       vel[2]=velocity.z;
                                                                        if(tutoriallevel!=1){
-                                                                               PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, TRUE);
-                                                                               FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel);
-                                                                               FSOUND_SetVolume(channels[heavyimpactsound], 128);
-                                                                               FSOUND_SetPaused(channels[heavyimpactsound], FALSE);
+                                                                               emit_sound_at(heavyimpactsound, victim->coords, 128.);
                                                                        }
                                                                        victim->RagDoll(0);
                                                                        XYZ relative;
@@ -4080,11 +2985,7 @@ void     Person::DoAnimations(){
                                                                        victim->Puff(abdomen);
                                                                        victim->DoDamage(damagemult*30/victim->protectionhigh);
 
-                                                                       if(id==0){
-                                                                               bonus=Reversal;
-                                                                               bonustime=0;
-                                                                               bonusvalue=60;
-                                                                       }
+                                                                       award_bonus(id, Reversal);
                                                                }
 
                                                                if(hasvictim&&targetanimation==sneakattackanim&&animation[targetanimation].label[currentframe]==7){
@@ -4105,40 +3006,22 @@ void    Person::DoAnimations(){
                                                                        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){
-                                                                               float gLoc[3];
-                                                                               float vel[3];
-                                                                               gLoc[0]=victim->coords.x;
-                                                                               gLoc[1]=victim->coords.y;
-                                                                               gLoc[2]=victim->coords.z;
-                                                                               vel[0]=velocity.x;
-                                                                               vel[1]=velocity.y;
-                                                                               vel[2]=velocity.z;
                                                                                if(weaponactive!=-1){
                                                                                        victim->DoBloodBig(200,225);
-                                                                                       PlaySoundEx( knifeslicesound, samp[knifeslicesound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[knifeslicesound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[knifeslicesound], 512);
-                                                                                       FSOUND_SetPaused(channels[knifeslicesound], FALSE);
-                                                                                       if(bloodtoggle)weapons.bloody[weaponids[weaponactive]]=2;
-                                                                                       weapons.blooddrip[weaponids[weaponactive]]+=5;
+                                                                                       emit_sound_at(knifeslicesound, victim->coords);
+                                                                                       if(bloodtoggle)weapons[weaponids[weaponactive]].bloody=2;
+                                                                                       weapons[weaponids[weaponactive]].blooddrip+=5;
                                                                                }
 
                                                                                if(creature==wolftype&&weaponactive==-1){
-                                                                                       PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[clawslicesound], 128);
-                                                                                       FSOUND_SetPaused(channels[clawslicesound], FALSE);
+                                                                                       emit_sound_at(clawslicesound, victim->coords, 128.);
                                                                                        victim->spurt=1;
                                                                                        victim->DoBloodBig(2,175);
                                                                                }
                                                                        }
-                                                                       if(id==0){
-                                                                               bonus=spinecrusher;
-                                                                               bonustime=0;
-                                                                               bonusvalue=100;
-                                                                       }
+                                                                       award_bonus(id, spinecrusher);
                                                                }
 
                                                                if(hasvictim&&(targetanimation==knifefollowanim||targetanimation==knifesneakattackanim)&&animation[targetanimation].label[currentframe]==5){
@@ -4151,60 +3034,39 @@ void    Person::DoAnimations(){
                                                                                        bloodvel=0;
                                                                                        bloodvel.z=20;
                                                                                        bloodvel.y=5;
-                                                                                       bloodvel=DoRotation(bloodvel,((float)(Random()%100))/4,rotation+((float)(Random()%100))/4,0)*scale;
-                                                                                       sprites.MakeSprite(bloodsprite, DoRotation(skeleton.joints[skeleton.jointlabels[neck]].position,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1);
+                                                                                       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;  
+                                                                                       XYZ footvel,footpoint;
                                                                                        footvel=0;
-                                                                                       footpoint=weapons.tippoint[weaponids[0]];
-                                                                                       if(bloodtoggle)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3);
-                                                                                       footvel=(weapons.tippoint[weaponids[0]]-weapons.position[weaponids[0]]);
-                                                                                       sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9);
-                                                                                       sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9);
-                                                                                       sprites.MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .3, 1);
-                                                                                       sprites.MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .3, 1);
+                                                                                       footpoint=weapons[weaponids[0]].tippoint;
+                                                                                       if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3);
+                                                                                       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);
+                                                                                       Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .3, 1);
                                                                                        victim->DoBloodBig(200,195);
-                                                                                       if(id==0){
-                                                                                               bonus=tracheotomy;
-                                                                                               bonustime=0;
-                                                                                               bonusvalue=100;
-                                                                                       }
-
-                                                                                       //victim->neckspurtamount=5;
+                                                                                       award_bonus(id, tracheotomy);
                                                                                }
                                                                                if(targetanimation==knifefollowanim){
-                                                                                       if(id==0){
-                                                                                               bonus=Stabbonus;
-                                                                                               bonustime=0;
-                                                                                               bonusvalue=40;
-                                                                                       }
-                                                                                       XYZ footvel,footpoint;  
+                                                                                       award_bonus(id, Stabbonus);
+                                                                                       XYZ footvel,footpoint;
                                                                                        footvel=0;
-                                                                                       footpoint=weapons.tippoint[weaponids[0]];
-                                                                                       if(bloodtoggle)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3);
-                                                                                       footvel=(weapons.tippoint[weaponids[0]]-weapons.position[weaponids[0]])*-1;
-                                                                                       sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9);
-                                                                                       sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9);
-                                                                                       sprites.MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .2, 1);
-                                                                                       sprites.MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .2, 1);
+                                                                                       footpoint=weapons[weaponids[0]].tippoint;
+                                                                                       if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3);
+                                                                                       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);
+                                                                                       Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .2, 1);
 
                                                                                }
                                                                                victim->bloodloss+=10000;
                                                                                victim->velocity=0;
-                                                                               float gLoc[3];
-                                                                               float vel[3];
-                                                                               gLoc[0]=victim->coords.x;
-                                                                               gLoc[1]=victim->coords.y;
-                                                                               gLoc[2]=victim->coords.z;
-                                                                               vel[0]=velocity.x;
-                                                                               vel[1]=velocity.y;
-                                                                               vel[2]=velocity.z;
-                                                                               PlaySoundEx( fleshstabsound, samp[fleshstabsound], NULL, TRUE);
-                                                                               FSOUND_3D_SetAttributes(channels[fleshstabsound], gLoc, vel);
-                                                                               FSOUND_SetVolume(channels[fleshstabsound], 512);
-                                                                               FSOUND_SetPaused(channels[fleshstabsound], FALSE);
-                                                                               if(bloodtoggle)weapons.bloody[weaponids[weaponactive]]=2;
-                                                                               weapons.blooddrip[weaponids[weaponactive]]+=5;
+                                                                               emit_sound_at(fleshstabsound, victim->coords);
+                                                                               if(bloodtoggle)weapons[weaponids[weaponactive]].bloody=2;
+                                                                               weapons[weaponids[weaponactive]].blooddrip+=5;
                                                                        }
                                                                }
 
@@ -4221,70 +3083,44 @@ void    Person::DoAnimations(){
                                                                                }
                                                                        }
                                                                        if(weaponactive!=-1&&animation[victim->targetanimation].attack!=reversal){
-                                                                               float gLoc[3];
-                                                                               float vel[3];
-                                                                               gLoc[0]=victim->coords.x;
-                                                                               gLoc[1]=victim->coords.y;
-                                                                               gLoc[2]=victim->coords.z;
-                                                                               vel[0]=velocity.x;
-                                                                               vel[1]=velocity.y;
-                                                                               vel[2]=velocity.z;
-                                                                               PlaySoundEx( fleshstabremovesound, samp[fleshstabremovesound], NULL, TRUE);
-                                                                               FSOUND_3D_SetAttributes(channels[fleshstabremovesound], gLoc, vel);
-                                                                               FSOUND_SetVolume(channels[fleshstabremovesound], 512);
-                                                                               FSOUND_SetPaused(channels[fleshstabremovesound], FALSE);
-                                                                               if(bloodtoggle)weapons.bloody[weaponids[weaponactive]]=2;
-                                                                               weapons.blooddrip[weaponids[weaponactive]]+=5;
-
-                                                                               XYZ footvel,footpoint;  
+                                                                               emit_sound_at(fleshstabremovesound, victim->coords);
+                                                                               if(bloodtoggle)weapons[weaponids[weaponactive]].bloody=2;
+                                                                               weapons[weaponids[weaponactive]].blooddrip+=5;
+
+                                                                               XYZ footvel,footpoint;
                                                                                footvel=0;
-                                                                               footpoint=weapons.tippoint[weaponids[0]];
-                                                                               if(bloodtoggle)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3);
-                                                                               footvel=(weapons.tippoint[weaponids[0]]-weapons.position[weaponids[0]])*-1;
-                                                                               sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9);
-                                                                               sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9);
-                                                                               sprites.MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .3, 1);
-                                                                               sprites.MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .3, 1);
+                                                                               footpoint=weapons[weaponids[0]].tippoint;
+                                                                               if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3);
+                                                                               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);
+                                                                               Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .3, 1);
                                                                        }
                                                                }
 
                                                                if(hasvictim&&(targetanimation==swordsneakattackanim)&&animation[targetanimation].label[currentframe]==5){
                                                                        if(weaponactive!=-1&&victim->bloodloss<victim->damagetolerance){
-                                                                               if(id==0){
-                                                                                       bonus=backstab;
-                                                                                       bonustime=0;
-                                                                                       bonusvalue=100;
-                                                                               }
+                                                                               award_bonus(id, backstab);
 
                                                                                escapednum=0;
 
-                                                                               XYZ footvel,footpoint;  
+                                                                               XYZ footvel,footpoint;
                                                                                footvel=0;
-                                                                               footpoint=(weapons.tippoint[weaponids[0]]+weapons.position[weaponids[0]])/2;
-                                                                               if(bloodtoggle)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3);
-                                                                               footvel=(weapons.tippoint[weaponids[0]]-weapons.position[weaponids[0]]);
-                                                                               sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9);
-                                                                               sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9);
-                                                                               sprites.MakeSprite(bloodflamesprite, footpoint,DoRotation(footvel*5,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .3, 1);
-                                                                               sprites.MakeSprite(bloodflamesprite, footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .3, 1);
+                                                                               footpoint=(weapons[weaponids[0]].tippoint+weapons[weaponids[0]].position)/2;
+                                                                               if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3);
+                                                                               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);
+                                                                               Sprite::MakeSprite(bloodflamesprite, footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .3, 1);
                                                                                victim->DoBloodBig(200,180);
                                                                                victim->DoBloodBig(200,215);
                                                                                victim->bloodloss+=10000;
                                                                                victim->velocity=0;
-                                                                               float gLoc[3];
-                                                                               float vel[3];
-                                                                               gLoc[0]=victim->coords.x;
-                                                                               gLoc[1]=victim->coords.y;
-                                                                               gLoc[2]=victim->coords.z;
-                                                                               vel[0]=velocity.x;
-                                                                               vel[1]=velocity.y;
-                                                                               vel[2]=velocity.z;
-                                                                               PlaySoundEx( fleshstabsound, samp[fleshstabsound], NULL, TRUE);
-                                                                               FSOUND_3D_SetAttributes(channels[fleshstabsound], gLoc, vel);
-                                                                               FSOUND_SetVolume(channels[fleshstabsound], 512);
-                                                                               FSOUND_SetPaused(channels[fleshstabsound], FALSE);
-                                                                               if(bloodtoggle)weapons.bloody[weaponids[weaponactive]]=2;
-                                                                               weapons.blooddrip[weaponids[weaponactive]]+=5;
+                                                                               emit_sound_at(fleshstabsound, victim->coords);
+                                                                               if(bloodtoggle)weapons[weaponids[weaponactive]].bloody=2;
+                                                                               weapons[weaponids[weaponactive]].blooddrip+=5;
                                                                        }
                                                                }
 
@@ -4295,30 +3131,19 @@ void    Person::DoAnimations(){
                                                                                victim->skeleton.joints[i].velocity=0;
                                                                        }
                                                                        if(weaponactive!=-1){
-                                                                               float gLoc[3];
-                                                                               float vel[3];
-                                                                               gLoc[0]=victim->coords.x;
-                                                                               gLoc[1]=victim->coords.y;
-                                                                               gLoc[2]=victim->coords.z;
-                                                                               vel[0]=velocity.x;
-                                                                               vel[1]=velocity.y;
-                                                                               vel[2]=velocity.z;
-                                                                               PlaySoundEx( fleshstabremovesound, samp[fleshstabremovesound], NULL, TRUE);
-                                                                               FSOUND_3D_SetAttributes(channels[fleshstabremovesound], gLoc, vel);
-                                                                               FSOUND_SetVolume(channels[fleshstabremovesound], 512);
-                                                                               FSOUND_SetPaused(channels[fleshstabremovesound], FALSE);
-                                                                               if(bloodtoggle)weapons.bloody[weaponids[weaponactive]]=2;
-                                                                               weapons.blooddrip[weaponids[weaponactive]]+=5;
-
-                                                                               XYZ footvel,footpoint;  
+                                                                               emit_sound_at(fleshstabremovesound, victim->coords);
+                                                                               if(bloodtoggle)weapons[weaponids[weaponactive]].bloody=2;
+                                                                               weapons[weaponids[weaponactive]].blooddrip+=5;
+
+                                                                               XYZ footvel,footpoint;
                                                                                footvel=0;
-                                                                               footpoint=weapons.tippoint[weaponids[0]];
-                                                                               if(bloodtoggle)sprites.MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3);
-                                                                               footvel=(weapons.tippoint[weaponids[0]]-weapons.position[weaponids[0]])*-1;
-                                                                               sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*7,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9);
-                                                                               sprites.MakeSprite(bloodsprite,footpoint,DoRotation(footvel*3,(float)(Random()%20),(float)(Random()%20),0), 1,1,1, .05, .9);
-                                                                               sprites.MakeSprite(bloodflamesprite, footpoint,footvel*5, 1,1,1, .3, 1);
-                                                                               sprites.MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .3, 1);
+                                                                               footpoint=weapons[weaponids[0]].tippoint;
+                                                                               if(bloodtoggle)Sprite::MakeSprite(cloudimpactsprite, footpoint,footvel, 1,0,0, .9, .3);
+                                                                               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);
+                                                                               Sprite::MakeSprite(bloodflamesprite, footpoint,footvel*2, 1,1,1, .3, 1);
                                                                        }
                                                                }
 
@@ -4329,51 +3154,30 @@ void    Person::DoAnimations(){
                                                                                victim->spurt=1;
                                                                                DoBlood(.2,240);
                                                                        }
-                                                                       float gLoc[3];
-                                                                       float vel[3];
-                                                                       gLoc[0]=victim->coords.x;
-                                                                       gLoc[1]=victim->coords.y;
-                                                                       gLoc[2]=victim->coords.z;
-                                                                       vel[0]=velocity.x;
-                                                                       vel[1]=velocity.y;
-                                                                       vel[2]=velocity.z;
                                                                        if(weaponactive==-1){
                                                                                if(tutoriallevel!=1){
-                                                                                       PlaySoundEx( heavyimpactsound, samp[heavyimpactsound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[heavyimpactsound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[heavyimpactsound], 128);
-                                                                                       FSOUND_SetPaused(channels[heavyimpactsound], FALSE);
+                                                                                       emit_sound_at(heavyimpactsound, 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(2/victim->armorhead,225);
-                                                                                       PlaySoundEx( knifeslicesound, samp[knifeslicesound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[knifeslicesound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[knifeslicesound], 512);
-                                                                                       FSOUND_SetPaused(channels[knifeslicesound], FALSE);
-                                                                                       if(bloodtoggle&&!weapons.bloody[weaponids[weaponactive]])weapons.bloody[weaponids[weaponactive]]=1;
-                                                                                       weapons.blooddrip[weaponids[weaponactive]]+=3;
+                                                                                       emit_sound_at(knifeslicesound, victim->coords);
+                                                                                       if(bloodtoggle&&!weapons[weaponids[weaponactive]].bloody)weapons[weaponids[weaponactive]].bloody=1;
+                                                                                       weapons[weaponids[weaponactive]].blooddrip+=3;
                                                                                }
-                                                                               if(weaponactive==-1&&creature==wolftype){       
-                                                                                       PlaySoundEx( clawslicesound, samp[clawslicesound], NULL, TRUE);
-                                                                                       FSOUND_3D_SetAttributes(channels[clawslicesound], gLoc, vel);
-                                                                                       FSOUND_SetVolume(channels[clawslicesound], 128);
-                                                                                       FSOUND_SetPaused(channels[clawslicesound], FALSE);
+                                                                               if(weaponactive==-1&&creature==wolftype){
+                                                                                       emit_sound_at(clawslicesound, victim->coords, 128.);
                                                                                        victim->spurt=1;
                                                                                        victim->DoBloodBig(2/victim->armorhead,175);
                                                                                }
                                                                        }
 
-                                                                       if(id==0){
-                                                                               bonus=Reversal;
-                                                                               bonustime=0;
-                                                                               bonusvalue=60;
-                                                                       }
+                                                                       award_bonus(id, Reversal);
 
                                                                        victim->Puff(neck);
 
@@ -4413,11 +3217,7 @@ void     Person::DoAnimations(){
 
                                                                if(hasvictim&&(targetanimation==spinkickreversalanim||targetanimation==sweepreversalanim||targetanimation==rabbitkickreversalanim||targetanimation==upunchreversalanim||targetanimation==jumpreversalanim||targetanimation==swordslashreversalanim||targetanimation==knifeslashreversalanim||targetanimation==rabbittacklereversal||targetanimation==wolftacklereversal||targetanimation==staffhitreversalanim||targetanimation==staffspinhitreversalanim))
                                                                        if(victim->damage>victim->damagetolerance&&bonus!=reverseko){
-                                                                               if(id==0){
-                                                                                       bonus=reverseko;
-                                                                                       bonustime=0;
-                                                                                       bonusvalue=100;
-                                                                               }
+                                                                         award_bonus(id, reverseko);
                                                                        }
                                                        }
 
@@ -4433,19 +3233,7 @@ void     Person::DoAnimations(){
                                                                if(currentanimation==rabbittackleanim||currentanimation==rabbittacklinganim){
                                                                        targetanimation=rollanim;
                                                                        targetframe=3;
-                                                                       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;
-
-                                                                       PlaySoundEx( movewhooshsound, samp[movewhooshsound], NULL, TRUE);
-                                                                       FSOUND_3D_SetAttributes(channels[movewhooshsound], gLoc, vel);
-                                                                       FSOUND_SetVolume(channels[movewhooshsound], 128);
-                                                                       FSOUND_SetPaused(channels[movewhooshsound], FALSE);
+                                                                       emit_sound_at(movewhooshsound, coords, 128.);
                                                                }
                                                                if(currentanimation==staggerbackhighanim){
                                                                        targetanimation=getIdle();
@@ -4485,34 +3273,10 @@ void    Person::DoAnimations(){
                                                                        }
 
                                                                        if(weaponactive==-1){
-                                                                               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;
-
-                                                                               PlaySoundEx( knifesheathesound, samp[knifesheathesound], NULL, TRUE);
-                                                                               FSOUND_3D_SetAttributes(channels[knifesheathesound], gLoc, vel);
-                                                                               FSOUND_SetVolume(channels[knifesheathesound], 128);
-                                                                               FSOUND_SetPaused(channels[knifesheathesound], FALSE);   
+                                                                               emit_sound_at(knifesheathesound, coords, 128.);
                                                                        }
                                                                        if(weaponactive!=-1){
-                                                                               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;
-
-                                                                               PlaySoundEx( knifedrawsound, samp[knifedrawsound], NULL, TRUE);
-                                                                               FSOUND_3D_SetAttributes(channels[knifedrawsound], gLoc, vel);
-                                                                               FSOUND_SetVolume(channels[knifedrawsound], 128);
-                                                                               FSOUND_SetPaused(channels[knifedrawsound], FALSE);      
+                                                                               emit_sound_at(knifedrawsound, coords, 128.);
                                                                        }
                                                                }
                                                                if(currentanimation==rollanim){
@@ -4573,9 +3337,9 @@ void      Person::DoAnimations(){
                                                                                                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;
@@ -4587,25 +3351,27 @@ void    Person::DoAnimations(){
                                                                                targetframe=3;
                                                                                velocity=facing*-8;
                                                                                velocity.y=4;
-                                                                               if(id==0)FSOUND_SetPaused(channels[whooshsound], FALSE);
+                                                                               if(id==0)
+                                                                                 resume_stream(whooshsound);
                                                                        }
                                                                        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;
                                                                        }
-                                                                       if(id==0)FSOUND_SetPaused(channels[whooshsound], FALSE);
+                                                                       if(id==0)
+                                                                         resume_stream(whooshsound);
                                                                }
                                                                if(targetanimation==walljumpleftanim){
                                                                        if(attackkeydown){
@@ -4628,9 +3394,9 @@ void      Person::DoAnimations(){
                                                                                                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;
@@ -4640,32 +3406,31 @@ void    Person::DoAnimations(){
                                                                        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;
                                                                        }
-                                                                       if(id==0)FSOUND_SetPaused(channels[whooshsound], FALSE);
+                                                                       if(id==0)
+                                                                         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);
@@ -4679,12 +3444,12 @@ void    Person::DoAnimations(){
                                                                if(animation[targetanimation].attack==reversal&&currentanimation!=sneakattackanim&&currentanimation!=knifesneakattackanim&&currentanimation!=swordsneakattackanim&&currentanimation!=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)
@@ -4693,24 +3458,24 @@ void    Person::DoAnimations(){
                                                                                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;
                                                                        }
@@ -4729,36 +3494,25 @@ void    Person::DoAnimations(){
                                                                }
                                                                if(animation[targetanimation].attack==reversed){
                                                                        escapednum++;
-                                                                       if(targetanimation==sweepreversedanim)targetrotation+=90;
+                                                                       if(targetanimation==sweepreversedanim)targetyaw+=90;
                                                                        targetanimation=backhandspringanim;
                                                                        targetframe=2;
-                                                                       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;
-                                                                       PlaySoundEx( landsound, samp[landsound], NULL, TRUE);
-                                                                       FSOUND_3D_SetAttributes(channels[landsound], gLoc, vel);
-                                                                       FSOUND_SetVolume(channels[landsound], 128);
-                                                                       FSOUND_SetPaused(channels[landsound], FALSE);
+                                                                       emit_sound_at(landsound, coords, 128);
 
                                                                        if(currentanimation==upunchreversedanim||currentanimation==swordslashreversedanim){
                                                                                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;
                                                                        }
                                                                }
@@ -4770,12 +3524,12 @@ void    Person::DoAnimations(){
                                                                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;
@@ -4787,10 +3541,10 @@ void    Person::DoAnimations(){
                                                                        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;
@@ -4803,13 +3557,13 @@ void    Person::DoAnimations(){
                                                                                //DoDamage(100);
                                                                                RagDoll(0);
                                                                                skeleton.spinny=0;
-                                                                               if(id!=0)SolidHitBonus();
+                                                                               SolidHitBonus(!id); // FIXME: tricky id
                                                                        }
                                                                        if(feint){
                                                                                escapednum++;
                                                                                targetanimation=rollanim;
                                                                                coords+=facing;
-                                                                               if(id==0)FSOUND_SetPaused(channels[whooshsound], TRUE);
+                                                                               if(id==0)pause_sound(whooshsound);
                                                                        }
                                                                        lastfeint=0;
                                                                }
@@ -4826,13 +3580,13 @@ void    Person::DoAnimations(){
                                                                                //DoDamage(100);
                                                                                RagDoll(0);
                                                                                skeleton.spinny=0;
-                                                                               if(id!=0)SolidHitBonus();
+                                                                               SolidHitBonus(!id); // FIXME: tricky id
                                                                        }
                                                                        if(feint){
                                                                                escapednum++;
                                                                                targetanimation=rollanim;
                                                                                coords+=facing*2;
-                                                                               if(id==0)FSOUND_SetPaused(channels[whooshsound], TRUE);
+                                                                               if(id==0)pause_sound(whooshsound);
                                                                        }
                                                                        lastfeint=0;
                                                                }
@@ -4864,7 +3618,7 @@ void      Person::DoAnimations(){
                                                                targetanimation=jumpdownanim;
                                                        }
                }
-               if(!skeleton.free){             
+               if(!skeleton.free){
                        oldtarget=target;
                        if(!transspeed&&animation[targetanimation].attack!=2&&animation[targetanimation].attack!=3){
                                if(!isRun()||!wasRun()){
@@ -4895,7 +3649,7 @@ void      Person::DoAnimations(){
                        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;
@@ -4904,7 +3658,7 @@ void      Person::DoAnimations(){
                        if(currentanimation!=oldcurrentanimation||targetanimation!=oldtargetanimation||((currentframe!=oldcurrentframe||targetframe!=oldtargetframe)&&!calcrot)){
                                //Old rotates
                                for(i=0;i<skeleton.num_joints;i++){
-                                       skeleton.joints[i].position=animation[currentanimation].position[i][currentframe];      
+                                       skeleton.joints[i].position=animation[currentanimation].position[i][currentframe];
                                }
 
                                skeleton.FindForwards();
@@ -4926,7 +3680,7 @@ void      Person::DoAnimations(){
 
                                //New rotates
                                for(i=0;i<skeleton.num_joints;i++){
-                                       skeleton.joints[i].position=animation[targetanimation].position[i][targetframe];        
+                                       skeleton.joints[i].position=animation[targetanimation].position[i][targetframe];
                                }
 
                                skeleton.FindForwards();
@@ -4975,20 +3729,18 @@ void    Person::DoAnimations(){
                }
 
                if(isLanding()&&landhard){
-                       //if(abs(velocity.y)>fast_sqrt(velocity.x*velocity.x*velocity.z*velocity.z)){
                        if(id==0)camerashake+=.4;
                        targetanimation=getLandhard();
                        targetframe=0;
                        target=0;
                        landhard=0;
                        transspeed=15;
-                       //}
                }
        }
        //skeleton.DoConstraints();
 }
 
-void   Person::DoStuff(){
+void   Person::DoStuff(){
        static XYZ terrainnormal;
        static XYZ flatfacing;
        static XYZ flatvelocity;
@@ -4998,7 +3750,6 @@ void      Person::DoStuff(){
        static int howmany;
        static int bloodsize;
        static int startx,starty,endx,endy;
-       static int texdetailint;
        static GLubyte color;
        static XYZ bloodvel;
 
@@ -5053,15 +3804,9 @@ void     Person::DoStuff(){
                        targetanimation=getRun();
                        targetframe=0;
                }
-               /*static float toggledelay;
-               toggledelay-=multiplier;
-               if(toggledelay<0){
-               toggledelay=1;
-               if(Random()%3==0)superruntoggle=1-superruntoggle;
-               }*/
        }
        if(weaponactive==-1&&num_weapons>0){
-               if(weapons.type[weaponids[0]]==staff){
+               if(weapons[weaponids[0]].getType()==staff){
                        weaponactive=0;
                }
        }
@@ -5072,7 +3817,7 @@ void      Person::DoStuff(){
                /*if(aitype!=playercontrolled)*/
                deathbleeding=1;
                if(burnt>.6)burnt=.6;
-               FSOUND_SetVolume(channels[stream_firesound], 256+256*findLength(&velocity)/3);
+               OPENAL_SetVolume(channels[stream_firesound], 256+256*findLength(&velocity)/3);
 
                if(targetanimation==jumpupanim||targetanimation==jumpdownanim||isFlip()){
                        float gLoc[3];
@@ -5085,8 +3830,8 @@ void      Person::DoStuff(){
                        vel[2]=velocity.z;
 
                        if(id==0){
-                               FSOUND_3D_SetAttributes(channels[whooshsound], gLoc, vel);
-                               FSOUND_SetVolume(channels[whooshsound], 64*findLength(&velocity)/5);
+                               OPENAL_3D_SetAttributes(channels[whooshsound], gLoc, vel);
+                               OPENAL_SetVolume(channels[whooshsound], 64*findLength(&velocity)/5);
                        }
                }
        }
@@ -5095,9 +3840,9 @@ void      Person::DoStuff(){
                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;
-               sprites.MakeSprite(flamesprite, flatfacing,flatvelocity, 1,1,1, .6+(float)abs(Random()%100)/200-.25, 1);
+               Sprite::MakeSprite(flamesprite, flatfacing,flatvelocity, 1,1,1, .6+(float)abs(Random()%100)/200-.25, 1);
        }
 
        while(flamedelay<0&&!onfire&&tutoriallevel==1&&id!=0){
@@ -5105,16 +3850,16 @@ void    Person::DoStuff(){
                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;
-               sprites.MakeSprite(breathsprite, flatfacing,flatvelocity, 1,1,1, .6+(float)abs(Random()%100)/200-.25, .3);      
+               Sprite::MakeSprite(breathsprite, flatfacing,flatvelocity, 1,1,1, .6+(float)abs(Random()%100)/200-.25, .3);
        }
 
        if(bleeding>0){
                bleeding-=multiplier*.3;
                if(bloodtoggle==2){
-                       glBindTexture(GL_TEXTURE_2D,skeleton.drawmodel.textureptr);
-                       if(bleeding<=0&&(detail!=2||osx))DoMipmaps(5,0,0,skeleton.skinsize,skeleton.skinsize);
+                       skeleton.drawmodel.textureptr.bind();
+                       if(bleeding<=0&&(detail!=2||osx))DoMipmaps();
                }
        }
 
@@ -5127,15 +3872,15 @@ void    Person::DoStuff(){
                        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)sprites.MakeSprite(bloodsprite, (skeleton.joints[skeleton.jointlabels[neck]].position+(skeleton.joints[skeleton.jointlabels[neck]].position-skeleton.joints[skeleton.jointlabels[head]].position)/5)*scale+coords,bloodvel, 1,1,1, .05, .9);
-                       if(!skeleton.free)sprites.MakeSprite(bloodsprite, DoRotation(skeleton.joints[skeleton.jointlabels[neck]].position+(skeleton.joints[skeleton.jointlabels[neck]].position-skeleton.joints[skeleton.jointlabels[head]].position)/5,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, .9);
+                       if(skeleton.free)Sprite::MakeSprite(bloodsprite, (skeleton.joints[skeleton.jointlabels[neck]].position+(skeleton.joints[skeleton.jointlabels[neck]].position-skeleton.joints[skeleton.jointlabels[head]].position)/5)*scale+coords,bloodvel, 1,1,1, .05, .9);
+                       if(!skeleton.free)Sprite::MakeSprite(bloodsprite, DoRotation(skeleton.joints[skeleton.jointlabels[neck]].position+(skeleton.joints[skeleton.jointlabels[neck]].position-skeleton.joints[skeleton.jointlabels[head]].position)/5,0,yaw,0)*scale+coords,bloodvel, 1,1,1, .05, .9);
                        neckspurtparticledelay=.05;
                }
                if(neckspurtdelay<0){
@@ -5151,31 +3896,27 @@ void    Person::DoStuff(){
                        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)sprites.MakeSprite(bloodsprite, skeleton.joints[skeleton.jointlabels[abdomen]].position*scale+coords,bloodvel, 1,1,1, .05, 1);
-                               if(!skeleton.free)sprites.MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[abdomen]].position+skeleton.joints[skeleton.jointlabels[abdomen]].position)/2,0,rotation,0)*scale+coords,bloodvel, 1,1,1, .05, 1);
-                       }                       
+                               if(skeleton.free)Sprite::MakeSprite(bloodsprite, skeleton.joints[skeleton.jointlabels[abdomen]].position*scale+coords,bloodvel, 1,1,1, .05, 1);
+                               if(!skeleton.free)Sprite::MakeSprite(bloodsprite, DoRotation((skeleton.joints[skeleton.jointlabels[abdomen]].position+skeleton.joints[skeleton.jointlabels[abdomen]].position)/2,0,yaw,0)*scale+coords,bloodvel, 1,1,1, .05, 1);
+                       }
                }
-               /*if(id==0){
-               bloodloss+=deathbleeding*40;
-               deathbleeding=0;
-               }*/
                bloodloss+=deathbleeding*multiplier*80;
                deathbleeding-=multiplier*1.6;
                //if(id==0)deathbleeding-=multiplier*.2;
-               if(deathbleeding<0)deathbleeding=0;     
+               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];
@@ -5196,9 +3937,7 @@ void      Person::DoStuff(){
                        }
 
                        if(!dead&&creature==wolftype){
-                               bonus=Wolfbonus;
-                               bonustime=0;
-                               bonusvalue=300; 
+                         award_bonus(0, Wolfbonus);
                        }
                        dead=2;
                        if(targetanimation==knifefollowedanim&&!skeleton.free){
@@ -5222,7 +3961,6 @@ void      Person::DoStuff(){
 
                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;
@@ -5234,10 +3972,6 @@ void     Person::DoStuff(){
                if(endy>skeleton.skinsize-1){endy=skeleton.skinsize-1;bleeding=0;}
                if(endx<startx)endx=startx;
                if(endy<starty)endy=starty;
-               /*int startx=0;
-               int starty=0;
-               int endx=256;
-               int endy=256;*/
 
                for(i=startx;i<endx;i++){
                        for(j=starty;j<endy;j++){
@@ -5250,8 +3984,8 @@ void      Person::DoStuff(){
                        }
                }
                if(!osx&&detail>1){
-                       glBindTexture(GL_TEXTURE_2D,skeleton.drawmodel.textureptr);
-                       DoMipmaps(0,startx,endx,starty,endy);
+                       skeleton.drawmodel.textureptr.bind();
+                       DoMipmaps();
                }
 
                if(!skeleton.free){
@@ -5375,12 +4109,12 @@ void    Person::DoStuff(){
                        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);
-                               sprites.MakeSprite(breathsprite, footpoint+footvel*.2,footvel*.4, 1,1,1, .4, .3);                                                       
+                               Sprite::MakeSprite(breathsprite, footpoint+footvel*.2,footvel*.4, 1,1,1, .4, .3);
                        }
                }
 
@@ -5468,7 +4202,7 @@ void      Person::DoStuff(){
                        }
                }
        }
-       if(creature==wolftype){                         
+       if(creature==wolftype){
                twitchdelay2-=multiplier*1.5;
                if(tailmorphend!=0)
                        if((isRun()||targetanimation==jumpupanim||targetanimation==jumpdownanim||targetanimation==backflipanim)&&!skeleton.free){
@@ -5541,11 +4275,11 @@ void    Person::DoStuff(){
                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;
        }
@@ -5577,23 +4311,21 @@ void    Person::DoStuff(){
                unconscioustime=0;
 
                if(creature==wolftype){
-                       bonus=Wolfbonus;
-                       bonustime=0;
-                       bonusvalue=300; 
+                 award_bonus(0, Wolfbonus);
                }
 
                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];
@@ -5613,12 +4345,6 @@ void     Person::DoStuff(){
                }
 
                damage+=20;
-
-               /*
-               if(bloodloss<damagetolerance)
-               for(i=0;i<skeleton.num_joints;i++){
-               skeleton.joints[i].velocity*=1.5;       
-               }*/
        }
 
        //if(dead)damage-=multiplier/4;
@@ -5643,22 +4369,22 @@ void    Person::DoStuff(){
                skeleton.free=1;
                damage-=20;
                for(i=0;i<skeleton.num_joints;i++){
-                       skeleton.joints[i].velocity=0;  
+                       skeleton.joints[i].velocity=0;
                }
        }
        if(permanentdamage>damagetolerance&&dead!=2){
                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];
@@ -5673,16 +4399,11 @@ void    Person::DoStuff(){
                bled=0;
 
                if(!dead&&creature==wolftype){
-                       bonus=Wolfbonus;
-                       bonustime=0;
-                       bonusvalue=300; 
+                 award_bonus(0, Wolfbonus);
                }
 
-               if(id!=0&&unconscioustime<.1&&(bonus!=spinecrusher||bonustime>1)&&(bonus!=FinishedBonus||bonustime>1)&&bloodloss<damagetolerance){
-                       bonus=touchofdeath;
-                       bonustime=0;
-                       bonusvalue=150;
-               }
+               if(unconscioustime<.1&&(bonus!=spinecrusher||bonustime>1)&&(bonus!=FinishedBonus||bonustime>1)&&bloodloss<damagetolerance)
+                 award_bonus(id, touchofdeath);
                if(id!=0&&unconscioustime>.1){
                        numafterkill++;
                }
@@ -5691,26 +4412,11 @@ void    Person::DoStuff(){
 
                skeleton.free=1;
 
-               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;
-               PlaySoundEx( breaksound, samp[breaksound], NULL, TRUE);
-               FSOUND_3D_SetAttributes(channels[breaksound], gLoc, vel);
-               FSOUND_SetVolume(channels[breaksound], 512);
-               FSOUND_SetPaused(channels[breaksound], FALSE);
-               /*if(id==0||findDistancefast(&coords,&viewer)<50){
-               slomo=1;
-               slomodelay=.2;
-               }*/
+               emit_sound_at(breaksound, coords);
        }
 
        if(skeleton.free==1){
-               if(id==0)FSOUND_SetPaused(channels[whooshsound], TRUE);
+               if(id==0)pause_sound(whooshsound);
 
                if(!dead){
                        //If knocked over, open hands and close mouth
@@ -5732,11 +4438,8 @@ void     Person::DoStuff(){
                skeleton.DoGravity(&scale);
                float damageamount;
                damageamount=skeleton.DoConstraints(&coords,&scale)*5;
-               if(id!=0&&damage>damagetolerance-damageamount&&!dead&&(bonus!=spinecrusher||bonustime>1)&&(bonus!=style||bonustime>1)&&(bonus!=cannon||bonustime>1)){
-                       bonus=deepimpact;
-                       bonustime=0;
-                       bonusvalue=50;
-               }
+               if(damage>damagetolerance-damageamount&&!dead&&(bonus!=spinecrusher||bonustime>1)&&(bonus!=style||bonustime>1)&&(bonus!=cannon||bonustime>1))
+                 award_bonus(id, deepimpact);
                DoDamage(damageamount/((protectionhigh+protectionhead+protectionlow)/3));
 
                average=0;
@@ -5763,20 +4466,11 @@ void    Person::DoStuff(){
                        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(skeleton.longdead>6000){
-                                       if(id==0)FSOUND_SetPaused(channels[whooshsound], TRUE);
+                                       if(id==0)pause_sound(whooshsound);
                                        skeleton.free=3;
                                        DrawSkeleton();
                                        skeleton.free=2;
@@ -5791,11 +4485,11 @@ void    Person::DoStuff(){
                                        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;
                                }
@@ -5809,11 +4503,11 @@ void    Person::DoStuff(){
                                        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;
                                }
@@ -5832,7 +4526,7 @@ void      Person::DoStuff(){
                                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){
@@ -5855,17 +4549,13 @@ void    Person::DoStuff(){
                                }
                                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;
 
-                               //if(skeleton.forward.y<0){
                                targetframe=0;
-                               //}
-                               //if(skeleton.forward.y>-.3){
                                //      targetframe=2;
-                               //}
                                targetanimation=flipanim;
                                crouchtogglekeydown=1;
                                target=0;
@@ -5881,7 +4571,7 @@ void      Person::DoStuff(){
 
                                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);
                                }
                        }
                }
@@ -5889,7 +4579,7 @@ void      Person::DoStuff(){
                if(findLength(&average)<10&&!dead&&skeleton.free){
                        skeleton.longdead+=(2000-findLength(&average))*multiplier+multiplier;
                        if(skeleton.longdead>(damage+500)*1.5){
-                               if(id==0)FSOUND_SetPaused(channels[whooshsound], TRUE);
+                               if(id==0)pause_sound(whooshsound);
                                skeleton.free=0;
                                velocity=0;
                                XYZ middle;
@@ -5910,26 +4600,12 @@ void    Person::DoStuff(){
                                }
                                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;
 
-                               /*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;
-                               */
-
-                               targettilt2=asin(terrainnormal.y)*180/3.14*-1;
-
 
 
                                if(skeleton.forward.y<0){
@@ -5939,8 +4615,8 @@ void      Person::DoStuff(){
                                }
                                if(skeleton.forward.y>-.3){
                                        targetanimation=getupfromfrontanim;
-                                       rotation+=180;
-                                       targetrotation+=180;
+                                       yaw+=180;
+                                       targetyaw+=180;
                                        targettilt2*=-1;
                                        targetframe=0;
                                        targettilt2=0;
@@ -5948,23 +4624,23 @@ void    Person::DoStuff(){
 
                                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;
                                        }
                                }
 
@@ -5978,23 +4654,23 @@ void    Person::DoStuff(){
 
                                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){
@@ -6003,23 +4679,12 @@ void    Person::DoStuff(){
                                }
                                else{
                                        targetanimation=backhandspringanim;
-                                       targetrotation+=180;
+                                       targetyaw+=180;
                                        targetframe=6;
                                }
                                target=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;
-                               PlaySoundEx( movewhooshsound, samp[movewhooshsound], NULL, TRUE);
-                               FSOUND_3D_SetAttributes(channels[movewhooshsound], gLoc, vel);
-                               FSOUND_SetVolume(channels[movewhooshsound], 128);
-                               FSOUND_SetPaused(channels[movewhooshsound], FALSE);
+                               emit_sound_at(movewhooshsound, coords, 128.);
 
                                currentanimation=targetanimation;
                                currentframe=targetframe-1;
@@ -6027,7 +4692,7 @@ void      Person::DoStuff(){
 
                                velocity=0;
 
-                               rotation=targetrotation;
+                               yaw=targetyaw;
                                tilt=0;
                                targettilt=0;
                                tilt2=0;
@@ -6036,9 +4701,6 @@ void      Person::DoStuff(){
                }
                if(skeleton.freefall==0)freefall=0;
 
-               if(!isnormal(velocity.x)&&velocity.x){
-                       int xy=1;
-               }
        }
 
        if(aitype!=passivetype||skeleton.free==1)
@@ -6048,18 +4710,7 @@ void     Person::DoStuff(){
                                        if(findDistancefastflat(&coords,&objects.position[i])<objects.scale[i]*objects.scale[i]*12&&findDistancefast(&coords,&objects.position[i])<objects.scale[i]*objects.scale[i]*49){
                                                if(onfire){
                                                        if(!objects.onfire[i]){
-                                                               float gLoc[3];
-                                                               float vel[3];
-                                                               gLoc[0]=objects.position[i].x;
-                                                               gLoc[1]=objects.position[i].y;
-                                                               gLoc[2]=objects.position[i].z;
-                                                               vel[0]=0;
-                                                               vel[1]=0;
-                                                               vel[2]=0;
-                                                               PlaySoundEx( firestartsound, samp[firestartsound], NULL, TRUE);
-                                                               FSOUND_3D_SetAttributes(channels[firestartsound], gLoc, vel);
-                                                               FSOUND_SetVolume(channels[firestartsound], 256);
-                                                               FSOUND_SetPaused(channels[firestartsound], FALSE);
+                                                               emit_sound_at(firestartsound, objects.position[i]);
                                                        }
                                                        objects.onfire[i]=1;
                                                }
@@ -6073,18 +4724,7 @@ void     Person::DoStuff(){
                                                if(findDistancefastflat(&coords,&objects.position[i])<objects.scale[i]*objects.scale[i]*12&&findDistancefast(&coords,&objects.position[i])<objects.scale[i]*objects.scale[i]*49){
                                                        if(onfire){
                                                                if(!objects.onfire[i]){
-                                                                       float gLoc[3];
-                                                                       float vel[3];
-                                                                       gLoc[0]=objects.position[i].x;
-                                                                       gLoc[1]=objects.position[i].y;
-                                                                       gLoc[2]=objects.position[i].z;
-                                                                       vel[0]=0;
-                                                                       vel[1]=0;
-                                                                       vel[2]=0;
-                                                                       PlaySoundEx( firestartsound, samp[firestartsound], NULL, TRUE);
-                                                                       FSOUND_3D_SetAttributes(channels[firestartsound], gLoc, vel);
-                                                                       FSOUND_SetVolume(channels[firestartsound], 256);
-                                                                       FSOUND_SetPaused(channels[firestartsound], FALSE);
+                                                                       emit_sound_at(firestartsound, objects.position[i]);
                                                                }
                                                                objects.onfire[i]=1;
                                                        }
@@ -6098,18 +4738,7 @@ void     Person::DoStuff(){
                                                                XYZ tempvel;
                                                                XYZ pos;
 
-                                                               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;
-                                                               PlaySoundEx( bushrustle, samp[bushrustle], NULL, TRUE);
-                                                               FSOUND_3D_SetAttributes(channels[bushrustle], gLoc, vel);
-                                                               FSOUND_SetVolume(channels[bushrustle], 40*findLength(&velocity));
-                                                               FSOUND_SetPaused(channels[bushrustle], FALSE);
+                                                               emit_sound_at(bushrustle, coords, 40*findLength(&velocity));
 
                                                                if(id==0){
                                                                        envsound[numenvsounds]=coords;
@@ -6132,8 +4761,8 @@ void      Person::DoStuff(){
                                                                                        pos.x+=float(abs(Random()%100)-50)/200;
                                                                                        pos.y+=float(abs(Random()%100)-50)/200;
                                                                                        pos.z+=float(abs(Random()%100)-50)/200;
-                                                                                       sprites.MakeSprite(splintersprite, pos,tempvel*.5+velocity*float(abs(Random()%100))/100, 165/255+float(abs(Random()%100)-50)/400,0,0, .2+float(abs(Random()%100)-50)/1300, 1);
-                                                                                       sprites.special[sprites.numsprites-1]=1;
+                                                                                       Sprite::MakeSprite(splintersprite, pos,tempvel*.5+velocity*float(abs(Random()%100))/100, 165/255+float(abs(Random()%100)-50)/400,0,0, .2+float(abs(Random()%100)-50)/1300, 1);
+                                                                                       Sprite::setLastSpriteSpecial(1);
                                                                                }
                                                                                howmany=findLength(&velocity)*4;
                                                                                if(detail==2)
@@ -6147,57 +4776,29 @@ void    Person::DoStuff(){
                                                                                                        pos.x+=float(abs(Random()%100)-50)/200;
                                                                                                        pos.y+=float(abs(Random()%100)-50)/200;
                                                                                                        pos.z+=float(abs(Random()%100)-50)/200;
-                                                                                                       sprites.MakeSprite(splintersprite, pos,tempvel*.3+velocity*float(abs(Random()%100))/100/2, 1,1,1, .1, 1);
-                                                                                                       sprites.special[sprites.numsprites-1]=2;
+                                                                                                       Sprite::MakeSprite(splintersprite, pos,tempvel*.3+velocity*float(abs(Random()%100))/100/2, 1,1,1, .1, 1);
+                                                                                                       Sprite::setLastSpriteSpecial(2);
                                                                                                }
                                                        }
                                                        objects.rotx[i]+=velocity.x*multiplier*6;
-                                                       objects.roty[i]+=velocity.z*multiplier*6;       
+                                                       objects.roty[i]+=velocity.z*multiplier*6;
                                                        objects.messedwith[i]=.5;
                                                }
                                                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(onfire){
-                                                               if(!objects.onfire[i]){
-                                                               float gLoc[3];
-                                                               float vel[3];
-                                                               gLoc[0]=objects.position[i].x;
-                                                               gLoc[1]=objects.position[i].y;
-                                                               gLoc[2]=objects.position[i].z;
-                                                               vel[0]=0;
-                                                               vel[1]=0;
-                                                               vel[2]=0;
-                                                               PlaySoundEx( firestartsound, samp[firestartsound], NULL, TRUE);
-                                                               FSOUND_3D_SetAttributes(channels[firestartsound], gLoc, vel);
-                                                               FSOUND_SetVolume(channels[firestartsound], 256);
-                                                               FSOUND_SetPaused(channels[firestartsound], FALSE);
-                                                               objects.onfire[i]=1;
-                                                               }
-                                                               }*/
                                                                if(objects.messedwith[i]<=0){
                                                                        XYZ tempvel;
                                                                        XYZ pos;
 
-                                                                       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;
-                                                                       PlaySoundEx( bushrustle, samp[bushrustle], NULL, TRUE);
-                                                                       FSOUND_3D_SetAttributes(channels[bushrustle], gLoc, vel);
-                                                                       FSOUND_SetVolume(channels[bushrustle], 40*findLength(&velocity));
-                                                                       FSOUND_SetPaused(channels[bushrustle], FALSE);
+                                                                       emit_sound_at(bushrustle, coords, 40*findLength(&velocity));
 
                                                                        if(id==0){
                                                                                envsound[numenvsounds]=coords;
@@ -6221,8 +4822,8 @@ void      Person::DoStuff(){
                                                                                                pos.x+=float(abs(Random()%100)-50)/150;
                                                                                                pos.y+=float(abs(Random()%100)-50)/150;
                                                                                                pos.z+=float(abs(Random()%100)-50)/150;
-                                                                                               sprites.MakeSprite(splintersprite, pos,tempvel*.5+velocity*float(abs(Random()%100))/100, 165/255+float(abs(Random()%100)-50)/400,0,0, .2+float(abs(Random()%100)-50)/1300, 1);
-                                                                                               sprites.special[sprites.numsprites-1]=1;
+                                                                                               Sprite::MakeSprite(splintersprite, pos,tempvel*.5+velocity*float(abs(Random()%100))/100, 165/255+float(abs(Random()%100)-50)/400,0,0, .2+float(abs(Random()%100)-50)/1300, 1);
+                                                                                               Sprite::setLastSpriteSpecial(1);
                                                                                        }
                                                                                        howmany=findLength(&velocity)*4;
                                                                                        if(detail==2)
@@ -6237,16 +4838,16 @@ void    Person::DoStuff(){
                                                                                                                pos.x+=float(abs(Random()%100)-50)/150;
                                                                                                                pos.y+=float(abs(Random()%100)-50)/150;
                                                                                                                pos.z+=float(abs(Random()%100)-50)/150;
-                                                                                                               sprites.MakeSprite(splintersprite, pos,tempvel*.3+velocity*float(abs(Random()%100))/100/2, 1,1,1, .1, 1);
-                                                                                                               sprites.special[sprites.numsprites-1]=2;
+                                                                                                               Sprite::MakeSprite(splintersprite, pos,tempvel*.3+velocity*float(abs(Random()%100))/100/2, 1,1,1, .1, 1);
+                                                                                                               Sprite::setLastSpriteSpecial(2);
                                                                                                        }
                                                                }
                                                                objects.messedwith[i]=.5;
-                                                       }       
+                                                       }
                                                }
                        }
 
-                       if(!skeleton.free){     
+                       if(!skeleton.free){
                                bool play;
                                play=0;
                                if((stunned>0||surprised>0)&&numplayers>2&&aitype!=passivetype)play=1;
@@ -6255,14 +4856,6 @@ void     Person::DoStuff(){
                                if(tutoriallevel==1&&id!=0)play=0;
                                if(play&&aitype!=playercontrolled){
                                        int whichsound=-1;
-                                       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;
                                        i=abs(Random()%4);
                                        if(speechdelay<=0){
                                                if(creature==rabbittype){
@@ -6275,16 +4868,11 @@ void    Person::DoStuff(){
                                                }
                                        }
                                        speechdelay=.3;
-                                       //else if(animation[targetanimation].label[targetframe]==4)whichsound=knifeswishsound;
-                                       //if(animation[targetanimation].label[targetframe]==8)whichsound=landsound2;
 
                                        if(whichsound!=-1){
-                                               PlaySoundEx( whichsound, samp[whichsound], NULL, TRUE);
-                                               FSOUND_3D_SetAttributes(channels[whichsound], gLoc, vel);
-                                               FSOUND_SetVolume(channels[whichsound], 512);
-                                               FSOUND_SetPaused(channels[whichsound], FALSE);
-                                       }       
-                               }       
+                                               emit_sound_at(whichsound, coords);
+                                       }
+                               }
 
                                if(targetanimation==staggerbackhighanim)staggerdelay=1;
                                if(targetanimation==staggerbackhardanim)staggerdelay=1;
@@ -6310,13 +4898,12 @@ void    Person::DoStuff(){
                                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){
                                        //open hands and close mouth
-                                       //if(targetanimation!=wolfidle){
                                        if(righthandmorphend!=0&&righthandmorphness==targetrighthandmorphness){
                                                righthandmorphness=0;
                                                righthandmorphend=0;
@@ -6328,7 +4915,6 @@ void      Person::DoStuff(){
                                                lefthandmorphend=0;
                                                targetlefthandmorphness=1;
                                        }
-                                       //s}
 
                                        if(headmorphend!=3&&headmorphend!=5&&headmorphstart!=3&&headmorphstart!=5&&headmorphend!=0&&headmorphness==targetheadmorphness){
                                                headmorphness=0;
@@ -6399,13 +4985,7 @@ void     Person::DoStuff(){
                                                targetheadmorphness=1;
                                        }
                                }
-                               /*
-                               if(speechdelay>.25){                    
-                               if(headmorphend!=2)headmorphness=0;
-                               headmorphend=2;
-                               targetheadmorphness=1;
-                               }
-                               */
+                               
                                bool behind;
                                behind=0;
                                if(hasvictim){
@@ -6424,11 +5004,11 @@ void    Person::DoStuff(){
                                        }
 
                                        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;
                                                }
@@ -6446,9 +5026,9 @@ void      Person::DoStuff(){
                                        flatfacing=0;
                                        flatfacing.z=1;
 
-                                       flatfacing=DoRotation(flatfacing,0,rotation,0);
+                                       flatfacing=DoRotation(flatfacing,0,yaw,0);
                                        facing=flatfacing;
-                                       ReflectVector(&facing,&terrainnormal);
+                                       ReflectVector(&facing,terrainnormal);
                                        Normalise(&facing);
 
                                        if(isRun()||targetanimation==sneakanim||targetanimation==rollanim||targetanimation==walkanim){
@@ -6494,36 +5074,36 @@ void    Person::DoStuff(){
                                        //if(!creature==wolftype||targetanimation==rabbitkickanim)
                                        if(targetanimation==rabbittackleanim){
                                                velocity+=facing*multiplier*speed*700*scale;
-                                               velspeed=findLength(&velocity); 
+                                               velspeed=findLength(&velocity);
                                                if(velspeed>speed*65*scale){
                                                        velocity/=velspeed;
                                                        velspeed=speed*65*scale;
                                                        velocity*=velspeed;
                                                }
                                                velocity.y+=gravity*multiplier*20;
-                                               ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z));
-                                               velspeed=findLength(&velocity); 
+                                               ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z));
+                                               velspeed=findLength(&velocity);
                                                velocity=flatfacing*velspeed;
                                        }
                                        if(targetanimation!=rabbitrunninganim&&targetanimation!=wolfrunninganim){
                                                if(isRun()||targetanimation==rabbitkickanim){
                                                        velocity+=facing*multiplier*speed*700*scale;
-                                                       velspeed=findLength(&velocity); 
+                                                       velspeed=findLength(&velocity);
                                                        if(velspeed>speed*45*scale){
                                                                velocity/=velspeed;
                                                                velspeed=speed*45*scale;
                                                                velocity*=velspeed;
                                                        }
                                                        velocity.y+=gravity*multiplier*20;
-                                                       ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z));
-                                                       velspeed=findLength(&velocity); 
+                                                       ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z));
+                                                       velspeed=findLength(&velocity);
                                                        if(velspeed<speed*30*scale)velspeed=speed*30*scale;
                                                        velocity=flatfacing*velspeed;
                                                }
                                        }
                                        else if(isRun()){
                                                velocity+=facing*multiplier*speed*700*scale;
-                                               velspeed=findLength(&velocity); 
+                                               velspeed=findLength(&velocity);
                                                if(creature==rabbittype){
                                                        if(velspeed>speed*55*scale){
                                                                velocity/=velspeed;
@@ -6539,109 +5119,94 @@ void   Person::DoStuff(){
                                                        }
                                                }
                                                velocity.y+=gravity*multiplier*20;
-                                               ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z));
-                                               velspeed=findLength(&velocity); 
+                                               ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z));
+                                               velspeed=findLength(&velocity);
                                                velocity=flatfacing*velspeed;
                                        }
 
-                                       /*if(creature==wolftype)
-                                       if(isRun()){
-                                       velocity+=facing*multiplier*speed*700*scale;
-                                       velspeed=findLength(&velocity); 
-                                       if(velspeed>speed*55*scale){
-                                       velocity/=velspeed;
-                                       velspeed=speed*55*scale;
-                                       velocity*=velspeed;
-                                       }
-                                       velocity.y+=gravity*multiplier*20;
-                                       ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z));
-                                       velspeed=findLength(&velocity); 
-                                       velocity=flatfacing*velspeed;
-                                       }*/
-
                                        if(targetanimation==rollanim&&animation[targetanimation].label[targetframe]!=6){
                                                velocity+=facing*multiplier*speed*700*scale;
-                                               velspeed=findLength(&velocity); 
+                                               velspeed=findLength(&velocity);
                                                if(velspeed>speed*45*scale){
                                                        velocity/=velspeed;
                                                        velspeed=speed*45*scale;
                                                        velocity*=velspeed;
                                                }
                                                velocity.y+=gravity*multiplier*20;
-                                               ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z));
-                                               velspeed=findLength(&velocity); 
+                                               ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z));
+                                               velspeed=findLength(&velocity);
                                                velocity=flatfacing*velspeed;
                                        }
 
 
                                        /*if(currentanimation==rollanim&&(isCrouch()||isIdle())){
                                        velocity+=facing*multiplier*speed*700*scale;
-                                       velspeed=findLength(&velocity); 
+                                       velspeed=findLength(&velocity);
                                        if(velspeed>speed*25*scale){
                                        velocity/=velspeed;
                                        velspeed=speed*25*scale;
                                        velocity*=velspeed;
                                        }
                                        velocity.y+=gravity*multiplier*20;
-                                       ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z));
-                                       velspeed=findLength(&velocity); 
+                                       ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z));
+                                       velspeed=findLength(&velocity);
                                        velocity=flatfacing*velspeed;
                                        }*/
 
                                        if(targetanimation==sneakanim||targetanimation==walkanim){
                                                velocity+=facing*multiplier*speed*700*scale;
-                                               velspeed=findLength(&velocity); 
+                                               velspeed=findLength(&velocity);
                                                if(velspeed>speed*12*scale){
                                                        velocity/=velspeed;
                                                        velspeed=speed*12*scale;
                                                        velocity*=velspeed;
                                                }
                                                velocity.y+=gravity*multiplier*20;
-                                               ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z));
-                                               velspeed=findLength(&velocity); 
+                                               ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z));
+                                               velspeed=findLength(&velocity);
                                                velocity=flatfacing*velspeed;
                                        }
 
                                        if((targetanimation==fightidleanim||targetanimation==knifefightidleanim)&&(currentanimation==bounceidleanim||currentanimation==hurtidleanim)){
                                                velocity+=facing*multiplier*speed*700*scale;
-                                               velspeed=findLength(&velocity); 
+                                               velspeed=findLength(&velocity);
                                                if(velspeed>speed*2*scale){
                                                        velocity/=velspeed;
                                                        velspeed=speed*2*scale;
                                                        velocity*=velspeed;
                                                }
                                                velocity.y+=gravity*multiplier*20;
-                                               ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z));
-                                               velspeed=findLength(&velocity); 
+                                               ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z));
+                                               velspeed=findLength(&velocity);
                                                velocity=flatfacing*velspeed;
                                        }
 
 
                                        if((targetanimation==bounceidleanim||currentanimation==hurtidleanim)&&(currentanimation==fightidleanim||currentanimation==knifefightidleanim)){
                                                velocity-=facing*multiplier*speed*700*scale;
-                                               velspeed=findLength(&velocity); 
+                                               velspeed=findLength(&velocity);
                                                if(velspeed>speed*2*scale){
                                                        velocity/=velspeed;
                                                        velspeed=speed*2*scale;
                                                        velocity*=velspeed;
                                                }
                                                velocity.y+=gravity*multiplier*20;
-                                               ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z));
-                                               velspeed=findLength(&velocity); 
+                                               ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z));
+                                               velspeed=findLength(&velocity);
                                                velocity=flatfacing*velspeed*-1;
                                        }
 
                                        if(targetanimation==fightsidestep){
                                                velocity+=DoRotation(facing*multiplier*speed*700*scale,0,-90,0);
-                                               velspeed=findLength(&velocity); 
+                                               velspeed=findLength(&velocity);
                                                if(velspeed>speed*12*scale){
                                                        velocity/=velspeed;
                                                        velspeed=speed*12*scale;
                                                        velocity*=velspeed;
                                                }
                                                velocity.y+=gravity*multiplier*20;
-                                               ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z));
-                                               velspeed=findLength(&velocity); 
+                                               ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z));
+                                               velspeed=findLength(&velocity);
                                                velocity=DoRotation(flatfacing*velspeed,0,-90,0);
                                        }
 
@@ -6657,34 +5222,34 @@ void    Person::DoStuff(){
                                        if(targetanimation==backhandspringanim){
                                                //coords-=facing*multiplier*50*scale;
                                                velocity+=facing*multiplier*speed*700*scale*-1;
-                                               velspeed=findLength(&velocity); 
+                                               velspeed=findLength(&velocity);
                                                if(velspeed>speed*50*scale){
                                                        velocity/=velspeed;
                                                        velspeed=speed*50*scale;
                                                        velocity*=velspeed;
                                                }
                                                velocity.y+=gravity*multiplier*20;
-                                               ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z));
-                                               velspeed=findLength(&velocity); 
+                                               ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z));
+                                               velspeed=findLength(&velocity);
                                                velocity=flatfacing*velspeed*-1;
                                        }
                                        if(targetanimation==dodgebackanim){
                                                //coords-=facing*multiplier*50*scale;
                                                velocity+=facing*multiplier*speed*700*scale*-1;
-                                               velspeed=findLength(&velocity); 
+                                               velspeed=findLength(&velocity);
                                                if(velspeed>speed*60*scale){
                                                        velocity/=velspeed;
                                                        velspeed=speed*60*scale;
                                                        velocity*=velspeed;
                                                }
                                                velocity.y+=gravity*multiplier*20;
-                                               ReflectVector(&velocity,&terrain.getNormal(coords.x,coords.z));
-                                               velspeed=findLength(&velocity); 
+                                               ReflectVector(&velocity,terrain.getNormal(coords.x,coords.z));
+                                               velspeed=findLength(&velocity);
                                                velocity=flatfacing*velspeed*-1;
                                        }
 
                                        if(targetanimation==jumpupanim||targetanimation==jumpdownanim||isFlip()){
-                                               velspeed=findLength(&velocity); 
+                                               velspeed=findLength(&velocity);
                                        }
 
 
@@ -6699,29 +5264,18 @@ void    Person::DoStuff(){
 
                                                if(targetanimation==jumpupanim){jumppower=-4;targetanimation=getIdle();}
                                                target=0;
-                                               targetframe=0;  
+                                               targetframe=0;
                                                onterrain=1;
 
                                                if(id==0){
-                                                       FSOUND_SetPaused(channels[whooshsound], TRUE);
-                                                       FSOUND_SetVolume(channels[whooshsound], 0);
+                                                       pause_sound(whooshsound);
+                                                       OPENAL_SetVolume(channels[whooshsound], 0);
                                                }
 
                                                if(targetanimation==jumpdownanim||isFlip()){
                                                        if(isFlip())jumppower=-4;
                                                        targetanimation=getLanding();
-                                                       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;
-                                                       PlaySoundEx( landsound, samp[landsound], NULL, TRUE);
-                                                       FSOUND_3D_SetAttributes(channels[landsound], gLoc, vel);
-                                                       FSOUND_SetVolume(channels[landsound], 128);
-                                                       FSOUND_SetPaused(channels[landsound], FALSE);
+                                                       emit_sound_at(landsound, coords, 128.);
 
                                                        if(id==0){
                                                                envsound[numenvsounds]=coords;
@@ -6740,7 +5294,7 @@ void      Person::DoStuff(){
 
 
                                        if(isIdle()||targetanimation==drawrightanim||targetanimation==drawleftanim||targetanimation==crouchdrawrightanim||targetanimation==crouchstabanim||targetanimation==swordgroundstabanim||isStop()||targetanimation==removeknifeanim||targetanimation==crouchremoveknifeanim||isLanding()||isCrouch()||animation[targetanimation].attack||(targetanimation==rollanim&&animation[targetanimation].label[targetframe]==6)){
-                                               velspeed=findLength(&velocity); 
+                                               velspeed=findLength(&velocity);
                                                velocity.y=0;
                                                if(velspeed<multiplier*300*scale){
                                                        velocity=0;
@@ -6757,7 +5311,7 @@ void      Person::DoStuff(){
                                        }
 
                                        if(isLandhard()){
-                                               velspeed=findLength(&velocity); 
+                                               velspeed=findLength(&velocity);
                                                velocity.y=0;
                                                if(velspeed<multiplier*600*scale){
                                                        velocity=0;
@@ -6777,45 +5331,31 @@ void    Person::DoStuff(){
                                        if(skiddingdelay<0)skiddingdelay+=multiplier;
                                        if(skiddingdelay>.02&&!forwardkeydown&&!backkeydown&&!leftkeydown&&!rightkeydown&&!jumpkeydown&&isLanding()&&!landhard){
                                                skiddingdelay=-1;
-                                               float gLoc[3];
-                                               float vel[3];
-                                               gLoc[0]=coords.x;
-                                               gLoc[1]=coords.y;
-                                               gLoc[2]=coords.z;
-                                               vel[0]=velocity.x;
-                                               vel[1]=velocity.y;
-                                               vel[2]=velocity.z;
                                                if(!onterrain||environment==grassyenvironment){
-                                                       PlaySoundEx( skidsound, samp[skidsound], NULL, TRUE);
-                                                       FSOUND_3D_SetAttributes(channels[skidsound], gLoc, vel);
-                                                       FSOUND_SetVolume(channels[skidsound], 128*velspeed/10);
-                                                       FSOUND_SetPaused(channels[skidsound], FALSE);
+                                                       emit_sound_at(skidsound, coords, 128*velspeed/10);
                                                }
                                                else {
-                                                       PlaySoundEx( snowskidsound, samp[snowskidsound], NULL, TRUE);
-                                                       FSOUND_3D_SetAttributes(channels[snowskidsound], gLoc, vel);
-                                                       FSOUND_SetVolume(channels[snowskidsound], 128*velspeed/10);
-                                                       FSOUND_SetPaused(channels[snowskidsound], FALSE);
+                                                       emit_sound_at(snowskidsound, coords, 128*velspeed/10);
                                                }
                                        }
 
                                        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;
                                        }
                        }
-                       skeleton.oldfree=skeleton.free; 
+                       skeleton.oldfree=skeleton.free;
 
                        XYZ midterrain;
                        midterrain=0;
@@ -6834,7 +5374,7 @@ void      Person::DoStuff(){
 
 int Person::DrawSkeleton(){
        int oldplayerdetail;
-       if((frustum.SphereInFrustum(coords.x,coords.y+scale*3,coords.z,scale*8)&&findDistancefast(&viewer,&coords)<viewdistance*viewdistance)||skeleton.free==3){  
+       if((frustum.SphereInFrustum(coords.x,coords.y+scale*3,coords.z,scale*8)&&findDistancefast(&viewer,&coords)<viewdistance*viewdistance)||skeleton.free==3){
                if(onterrain&&(isIdle()||isCrouch()||wasIdle()||wasCrouch())&&!skeleton.free){
                        calcrot=1;
                }
@@ -6849,7 +5389,7 @@ int Person::DrawSkeleton(){
                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;
@@ -6863,9 +5403,12 @@ int Person::DrawSkeleton(){
                if(findDistancefast(&viewer,&coords)<viewdistance*viewdistance/256&&(detail!=1&&detail!=2)){
                        playerdetail=1;
                }
-               if(id==0)playerdetail=1;
-               if(playerdetail!=oldplayerdetail)updatedelay=0;
-               if(playerdetail!=oldplayerdetail)normalsupdatedelay=0;
+               if(id==0)
+                       playerdetail=1;
+               if(playerdetail!=oldplayerdetail) {
+                       updatedelay=0;
+                       normalsupdatedelay=0;
+               }
                static float updatedelaychange;
                static float morphness;
                static float framemult;
@@ -6880,48 +5423,48 @@ int Person::DrawSkeleton(){
                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);
@@ -6929,41 +5472,41 @@ int Person::DrawSkeleton(){
                                }
                                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);
@@ -6972,52 +5515,53 @@ int Person::DrawSkeleton(){
 
                                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!=getupfrombackanim&&((targetanimation!=rollanim&&!isFlip())||animation[targetanimation].label[targetframe]==6)&&targetanimation!=getupfromfrontanim&&targetanimation!=wolfrunninganim&&targetanimation!=rabbitrunninganim&&targetanimation!=backhandspringanim&&targetanimation!=walljumpfrontanim&&targetanimation!=hurtidleanim&&!isLandhard()&&!isSleeping()))DoHead();
+                       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;
@@ -7080,35 +5624,11 @@ int Person::DrawSkeleton(){
 
                                                skeleton.muscles[i].lastrotate3=skeleton.muscles[i].rotate3;
                                                glRotatef(-skeleton.muscles[i].lastrotate3,0,1,0);
-                                               /*
-                                               if(!isnormal(proportionbody.x)||!isnormal(proportionbody.y)||!isnormal(proportionbody.z)){
-                                               proportionbody=1;
-                                               proportionweird=1;
-                                               }
-                                               if(!isnormal(proportionarms.x)||!isnormal(proportionarms.y)||!isnormal(proportionarms.z)){
-                                               proportionarms=1;
-                                               proportionweird=1;
-                                               }
-                                               if(!isnormal(proportionhead.x)||!isnormal(proportionhead.y)||!isnormal(proportionhead.z)){
-                                               proportionhead=1;
-                                               proportionweird=1;
-                                               }
-                                               if(!isnormal(proportionlegs.x)||!isnormal(proportionlegs.y)||!isnormal(proportionlegs.z)){
-                                               proportionlegs=1;
-                                               proportionweird=1;
-                                               }*/
 
                                                if(playerdetail||skeleton.free==3)
                                                {
                                                        for(j=0;j<skeleton.muscles[i].numvertices;j++)
                                                        {
-                                                               /*if(!isnormal(skeleton.model[start].vertex[skeleton.muscles[i].vertices[j]].x))vertexweird[0]=1;
-                                                               if(!isnormal(skeleton.model[start].vertex[skeleton.muscles[i].vertices[j]].y))vertexweird[1]=1;
-                                                               if(!isnormal(skeleton.model[start].vertex[skeleton.muscles[i].vertices[j]].z))vertexweird[2]=1;
-                                                               if(!isnormal(skeleton.model[endthing].vertex[skeleton.muscles[i].vertices[j]].x))vertexweird[3]=1;
-                                                               if(!isnormal(skeleton.model[endthing].vertex[skeleton.muscles[i].vertices[j]].y))vertexweird[4]=1;
-                                                               if(!isnormal(skeleton.model[endthing].vertex[skeleton.muscles[i].vertices[j]].z))vertexweird[5]=1;
-                                                               if(skeleton.muscles[i].vertices[j]<skeleton.model[start].vertexNum&&skeleton.muscles[i].vertices[j]>=0){*/
                                                                glMatrixMode(GL_MODELVIEW);                                                     // Select The Modelview Matrix
                                                                glPushMatrix();
                                                                        if(skeleton.muscles[i].parent1->label==abdomen||skeleton.muscles[i].parent2->label==abdomen)
@@ -7129,24 +5649,18 @@ int Person::DrawSkeleton(){
                                                                                (skeleton.model[start].vertex[skeleton.muscles[i].vertices[j]].z*(1-morphness)+skeleton.model[endthing].vertex[skeleton.muscles[i].vertices[j]].z*morphness)*proportionhead.z);
                                                                        glGetFloatv(GL_MODELVIEW_MATRIX,M);
                                                                        //if(!isnormal(M[12])||!isnormal(M[13])||!isnormal(M[14]))test=0;
-                                                                       //if(isnormal(M[12])&&isnormal(M[13])&&isnormal(M[14])){
                                                                        //if(!isnormal(scale))test=1;
-                                                                       //if(isnormal(scale)){
                                                                        skeleton.drawmodel.vertex[skeleton.muscles[i].vertices[j]].x=M[12]*scale;
                                                                        skeleton.drawmodel.vertex[skeleton.muscles[i].vertices[j]].y=M[13]*scale;
                                                                        skeleton.drawmodel.vertex[skeleton.muscles[i].vertices[j]].z=M[14]*scale;
                                                                        //test=2;
-                                                                       //}
-                                                                       //}
                                                                glPopMatrix();
-                                                               //}
                                                        }
                                                }
                                                if(!playerdetail||skeleton.free==3)
                                                {
                                                        for(j=0;j<skeleton.muscles[i].numverticeslow;j++)
                                                        {
-                                                               //if(skeleton.muscles[i].verticeslow[j]<skeleton.modellow.vertexNum&&skeleton.muscles[i].verticeslow[j]>=0){
                                                                glMatrixMode(GL_MODELVIEW);                                                     // Select The Modelview Matrix
                                                                glPushMatrix();
                                                                        if(skeleton.muscles[i].parent1->label==abdomen||skeleton.muscles[i].parent2->label==abdomen)
@@ -7171,7 +5685,6 @@ int Person::DrawSkeleton(){
                                                                        skeleton.drawmodellow.vertex[skeleton.muscles[i].verticeslow[j]].y=M[13]*scale;
                                                                        skeleton.drawmodellow.vertex[skeleton.muscles[i].verticeslow[j]].z=M[14]*scale;
                                                                glPopMatrix();
-                                                               //}
                                                        }
                                                }
                                        glPopMatrix();
@@ -7251,7 +5764,7 @@ int Person::DrawSkeleton(){
                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);
@@ -7317,12 +5830,12 @@ int Person::DrawSkeleton(){
                        }
                        if(playerdetail){
                                if(!showpoints){
-                                       if((tutoriallevel&&id!=0))skeleton.drawmodel.drawdifftex(sprites.cloudimpacttexture);
+                                       if((tutoriallevel&&id!=0))skeleton.drawmodel.drawdifftex(Sprite::cloudimpacttexture);
                                        else skeleton.drawmodel.draw();
                                }
                        }
                        if(!playerdetail){
-                               if((tutoriallevel&&id!=0))skeleton.drawmodellow.drawdifftex(sprites.cloudimpacttexture);
+                               if((tutoriallevel&&id!=0))skeleton.drawmodellow.drawdifftex(Sprite::cloudimpacttexture);
                                else skeleton.drawmodellow.drawdifftex(skeleton.drawmodel.textureptr);
                        }
 
@@ -7346,12 +5859,12 @@ int Person::DrawSkeleton(){
                                                glTranslatef(smoketex*.6,0,0);
                                                if(playerdetail){
                                                        if(!showpoints){
-                                                               if((tutoriallevel&&id!=0))skeleton.drawmodel.drawdifftex(sprites.cloudimpacttexture);
+                                                               if((tutoriallevel&&id!=0))skeleton.drawmodel.drawdifftex(Sprite::cloudimpacttexture);
                                                                else skeleton.drawmodel.draw();
                                                        }
                                                }
                                                if(!playerdetail){
-                                                       if((tutoriallevel&&id!=0))skeleton.drawmodellow.drawdifftex(sprites.cloudimpacttexture);
+                                                       if((tutoriallevel&&id!=0))skeleton.drawmodellow.drawdifftex(Sprite::cloudimpacttexture);
                                                        else skeleton.drawmodellow.drawdifftex(skeleton.drawmodel.textureptr);
                                                }
                                }
@@ -7375,8 +5888,8 @@ int Person::DrawSkeleton(){
                if(num_weapons>0){
                        for(k=0;k<num_weapons;k++){
                                i=weaponids[k];
-                               if(weaponactive==k){                                            
-                                       if(weapons.type[i]!=staff){
+                               if(weaponactive==k){
+                                       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;
@@ -7390,7 +5903,7 @@ int Person::DrawSkeleton(){
                                                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;
@@ -7410,26 +5923,19 @@ int Person::DrawSkeleton(){
                                                CrossProduct(&vec1,&vec2,&tempnormthing);
                                                Normalise(&tempnormthing);
                                                if(targetanimation!=staffhitanim&&currentanimation!=staffhitanim&&targetanimation!=staffgroundsmashanim&&currentanimation!=staffgroundsmashanim&&targetanimation!=staffspinhitanim&&currentanimation!=staffspinhitanim)weaponpoint+=tempnormthing*.1-skeleton.specialforward[1]*.3+(skeleton.joints[skeleton.jointlabels[rightwrist]].position-skeleton.joints[skeleton.jointlabels[rightelbow]].position);
-                                               /*if(targetanimation==staffhitanim||currentanimation==staffhitanim){
-                                               XYZ weaptargnorm;
-                                               weaptargnorm=DoRotation(weapons.tippoint[i]-weapons.position[i],0,-rotation,0);
-                                               //weaptargnorm=animation[currentanimation].weapontarget[currentframe]*(1-target)+animation[targetanimation].weapontarget[targetframe]*(target);
-                                               Normalise(&weaptargnorm);
-                                               weaponpoint-=weaptargnorm*2;
-                                               }*/
                                        }
                                }
-                               if(weaponactive!=k&&weaponstuck!=k){                                            
-                                       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(weaponactive!=k&&weaponstuck!=k){
+                                       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(weaponstuck==k){                                             
+                               if(weaponstuck==k){
                                        if(weaponstuckwhere==0)weaponpoint=skeleton.joints[skeleton.jointlabels[abdomen]].position*.5+skeleton.joints[skeleton.jointlabels[neck]].position*.5-skeleton.forward*.8;
                                        else weaponpoint=skeleton.joints[skeleton.jointlabels[abdomen]].position*.5+skeleton.joints[skeleton.jointlabels[neck]].position*.5+skeleton.forward*.8;
                                        for(j=0;j<skeleton.num_muscles;j++){
@@ -7438,30 +5944,29 @@ int Person::DrawSkeleton(){
                                                }
                                        }
                                }
-                               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;
@@ -7470,16 +5975,16 @@ int Person::DrawSkeleton(){
                                                        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;
@@ -7488,41 +5993,41 @@ int Person::DrawSkeleton(){
                                                        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&&currentanimation==swordgroundstabanim)||(targetanimation==swordsneakattackanim&&currentanimation==swordsneakattackanim)||(targetanimation==swordslashparryanim&&currentanimation==swordslashparryanim)||(targetanimation==swordslashparriedanim&&currentanimation==swordslashparriedanim)||(targetanimation==swordslashreversalanim&&currentanimation==swordslashreversalanim)||(targetanimation==swordslashreversedanim&&currentanimation==swordslashreversedanim)||(targetanimation==knifeslashreversalanim&&currentanimation==knifeslashreversalanim)||(targetanimation==knifeslashreversedanim&&currentanimation==knifeslashreversedanim)||(targetanimation==swordslashanim&&currentanimation==swordslashanim)||(targetanimation==drawleftanim&&currentanimation==drawleftanim)||(currentanimation==backhandspringanim&&targetanimation==backhandspringanim)){
                                                        XYZ temppoint1,temppoint2,tempforward;
@@ -7531,21 +6036,21 @@ int Person::DrawSkeleton(){
                                                        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&&currentanimation==staffhitanim)||(targetanimation==staffhitreversedanim&&currentanimation==staffhitreversedanim)||(targetanimation==staffspinhitreversedanim&&currentanimation==staffspinhitreversedanim)||(targetanimation==staffgroundsmashanim&&currentanimation==staffgroundsmashanim)||(targetanimation==staffspinhitanim&&currentanimation==staffspinhitanim)){
                                                        XYZ temppoint1,temppoint2,tempforward;
                                                        float distance;
@@ -7553,39 +6058,39 @@ int Person::DrawSkeleton(){
                                                        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(animation[targetanimation].height==lowheight&&animation[targetanimation].attack==neutral){
-                                       //}
+                                       if(weaponstuckwhere==0)
+                                               weapons[i].smallrotation=180;
+                                       else
+                                               weapons[i].smallrotation=0;
+                                       weapons[i].smallrotation2=10;
                                }
                        }
                }
@@ -7649,29 +6154,18 @@ int Person::SphereCheck(XYZ *p1,float radius, XYZ *p, XYZ *move, float *rotate,
 
                                                                if(targetanimation==jumpupanim){jumppower=-4;targetanimation=getIdle();}
                                                                target=0;
-                                                               targetframe=0;  
+                                                               targetframe=0;
                                                                onterrain=1;
 
                                                                if(id==0){
-                                                                       FSOUND_SetPaused(channels[whooshsound], TRUE);
-                                                                       FSOUND_SetVolume(channels[whooshsound], 0);
+                                                                       pause_sound(whooshsound);
+                                                                       OPENAL_SetVolume(channels[whooshsound], 0);
                                                                }
 
                                                                if((targetanimation==jumpdownanim||isFlip())&&!wasLanding()&&!wasLandhard()){
                                                                        if(isFlip())jumppower=-4;
                                                                        targetanimation=getLanding();
-                                                                       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;
-                                                                       PlaySoundEx( landsound, samp[landsound], NULL, TRUE);
-                                                                       FSOUND_3D_SetAttributes(channels[landsound], gLoc, vel);
-                                                                       FSOUND_SetVolume(channels[landsound], 128);
-                                                                       FSOUND_SetPaused(channels[landsound], FALSE);
+                                                                       emit_sound_at(landsound, coords, 128.);
 
                                                                        if(id==0){
                                                                                envsound[numenvsounds]=coords;
@@ -7725,281 +6219,3 @@ int Person::SphereCheck(XYZ *p1,float radius, XYZ *p, XYZ *move, float *rotate,
        *p1+=*move;
        return firstintersecting;
 }
-
-Person::Person()
-{
-       whichpatchx = 0;
-       whichpatchz = 0;
-
-       currentframe = 0;
-       targetframe = 0;
-       currentanimation = 0;
-       targetanimation = 0;
-       oldcurrentframe = 0;
-       oldtargetframe = 0;
-       oldcurrentanimation = 0;
-       oldtargetanimation = 0;
-
-       howactive = 0;
-
-       parriedrecently = 0;
-
-       superruntoggle = 0;
-
-       lastattack = 0,lastattack2 = 0,lastattack3 = 0;
-
-       currentoffset = 0,targetoffset = 0,offset = 0;
-       target = 0;
-       transspeed = 0;
-
-       realoldcoords = 0;
-       oldcoords = 0;
-       coords = 0;
-       originalcoords = 0;
-       velocity = 0;
-
-       proportionhead = 0;
-       proportionlegs = 0;
-       proportionarms = 0;
-       proportionbody = 0;
-
-       heightleft = 0;
-       heightright = 0;
-
-       unconscioustime = 0;
-
-       immobile = 0;
-
-       velspeed = 0;
-       targetrotation = 0;
-       targetrot = 0;
-       rot = 0;
-       oldrot = 0;
-       lookrotation = 0;
-       lookrotation2 = 0;
-       rotation = 0;
-       rotation2 = 0;
-       lowrotation = 0;
-       tilt = 0;
-       targettilt = 0;
-       tilt2 = 0;
-       targettilt2 = 0;
-       rabbitkickenabled = 0;
-
-       bloodloss = 0;
-       bleeddelay = 0;
-       skiddelay = 0;
-       skiddingdelay = 0;
-       deathbleeding = 0;
-       tempdeltav = 0;
-
-       damagetolerance = 0;
-       damage = 0;
-       permanentdamage = 0;
-       superpermanentdamage = 0;       lastcollide = 0;
-       dead = 0;
-
-       jumppower = 0;
-       onground = 0;
-       madskills = 0;
-
-       wentforweapon = 0;
-
-       calcrot = 0;
-
-       backwardsanim = 0;
-
-       facing = 0;
-
-       bleeding = 0;
-       bleedx = 0,bleedy;
-       direction = 0;
-       texupdatedelay = 0;
-
-       headrotation = 0,headrotation2 = 0;
-       targetheadrotation = 0,targetheadrotation2 = 0;
-
-       onterrain = 0;
-       pause = 0;
-
-       grabdelay = 0;
-
-       victim = 0;
-       hasvictim = 0;
-
-       updatedelay = 0;
-       normalsupdatedelay = 0;
-
-       jumpstart = 0;
-
-       forwardkeydown = 0;
-       forwardstogglekeydown = 0;
-       rightkeydown = 0;
-       leftkeydown = 0;
-       backkeydown = 0;
-       jumpkeydown = 0;
-       jumptogglekeydown = 0;
-       crouchkeydown = 0;
-       crouchtogglekeydown = 0;
-       drawkeydown = 0;
-       drawtogglekeydown = 0;
-       throwkeydown = 0;
-       throwtogglekeydown = 0;
-       attackkeydown = 0;
-       feint = 0;
-       lastfeint = 0;
-       headless = 0;
-
-       crouchkeydowntime = 0;
-       jumpkeydowntime = 0;
-       freefall = 0;
-
-
-       turnspeed = 0;
-
-       aitype = 0;
-       aitarget = 0;
-       aiupdatedelay = 0;
-       losupdatedelay = 0;
-       ally = 0;
-       movetarget = 0;
-       collide = 0;
-       collided = 0;
-       avoidcollided = 0;
-       loaded = 0;
-       whichdirection = 0;
-       whichdirectiondelay = 0;
-       avoidsomething = 0;     avoidwhere = 0;
-       blooddimamount = 0;
-
-       staggerdelay = 0;
-       blinkdelay = 0;
-       twitchdelay = 0;
-       twitchdelay2 = 0;
-       twitchdelay3 = 0;
-       lefthandmorphness = 0;
-       righthandmorphness = 0;
-       headmorphness = 0;
-       chestmorphness = 0;
-       tailmorphness = 0;
-       targetlefthandmorphness = 0;
-       targetrighthandmorphness = 0;
-       targetheadmorphness = 0;
-       targetchestmorphness = 0;
-       targettailmorphness = 0;
-       lefthandmorphstart = 0,lefthandmorphend = 0;
-       righthandmorphstart = 0,righthandmorphend = 0;
-       headmorphstart = 0,headmorphend = 0;
-       chestmorphstart = 0,chestmorphend = 0;
-       tailmorphstart = 0,tailmorphend = 0;
-
-       weaponmissdelay = 0;
-       highreversaldelay = 0;
-       lowreversaldelay = 0;
-       nocollidedelay = 0;
-
-       creature = 0;
-
-       id = 0;
-
-       //Skeleton skeleton;
-
-       speed = 0;
-       scale = 0;
-       power = 0;
-       speedmult = 0;
-
-       protectionhead = 0;
-       protectionhigh = 0;
-       protectionlow = 0;
-       armorhead = 0;
-       armorhigh = 0;
-       armorlow = 0;
-       metalhead = 0;
-       metalhigh = 0;
-       metallow = 0;
-
-       numclothes = 0;
-
-       memset(clothes, 0, sizeof(clothes));
-       memset(clothestintr, 0, sizeof(clothestintr));
-       memset(clothestintg, 0, sizeof(clothestintg));
-       memset(clothestintb, 0, sizeof(clothestintb));
-
-       landhard = 0;
-       bled = 0;
-       spurt = 0;
-       onfire = 0;
-       onfiredelay = 0;        burnt = 0;
-       fireduration = 0;
-
-       flamedelay = 0;
-       updatestuffdelay = 0;
-
-       playerdetail = 0;
-
-       num_weapons = 0;
-
-       memset(weaponids, 0, sizeof(weaponids));
-
-       weaponactive = 0;
-       weaponstuck = 0;
-       weaponstuckwhere = 0;
-       weaponwhere = 0;
-
-       numwaypoints = 0;
-
-       memset(waypoints, 0, sizeof(waypoints));
-       memset(waypointtype, 0, sizeof(waypointtype));
-
-       pausetime = 0;
-       hastempwaypoint = 0;
-       tempwaypoint = 0;
-
-       headtarget = 0;
-       interestdelay = 0;
-
-       finalfinaltarget = 0;
-       finaltarget = 0;
-       finalpathfindpoint = 0;
-       targetpathfindpoint = 0;
-       lastpathfindpoint = 0;
-       lastpathfindpoint2 = 0;
-       lastpathfindpoint3 = 0;
-       lastpathfindpoint4 = 0;
-       onpath = 0;
-
-       waypoint = 0;
-       jumppath = 0;
-
-       lastseen = 0;
-       lastseentime = 0;
-       lastchecktime = 0;
-       stunned = 0;
-       surprised = 0;
-       runninghowlong = 0;     lastoccluded = 0;
-       laststanding = 0;
-       escapednum = 0;
-
-       speechdelay = 0;
-       neckspurtdelay = 0;
-       neckspurtparticledelay = 0;
-       neckspurtamount = 0;
-
-       whichskin = 0;
-       rabbitkickragdoll = 0;
-
-       averageloc = 0;
-       oldaverageloc = 0;
-
-       //Animation tempanimation;
-
-       occluded = 0;
-
-       jumpclimb = 0;
-}
-
-Person::~Person()
-{
-}
-