X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FPerson.cpp;h=107edb4f436f80b8882a6943aa9bbc40017c105a;hb=6f3fa5a970fa12cf6529c56a1f859b2668a8a232;hp=3f643607323b49c4f8a419b3bf85d678d384b04e;hpb=4b65ff967257d8cfd673257e464c3e3e35822ec1;p=lugaru.git diff --git a/Source/Person.cpp b/Source/Person.cpp index 3f64360..107edb4 100644 --- a/Source/Person.cpp +++ b/Source/Person.cpp @@ -202,32 +202,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; @@ -237,50 +217,18 @@ 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; @@ -288,16 +236,6 @@ int Person::getLandhard(){ } -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;