X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FPerson.cpp;h=6eb59f04a07e1b240bcf49a60399160a5a3773ad;hb=fedce5619a42a2ac4f55c6dab16470970ce36cbb;hp=818e6ce29c404ed5a61a206bc1d7362b814df377;hpb=03e3d05a91e2a3aea407387d9531177b2ca31813;p=lugaru.git diff --git a/Source/Person.cpp b/Source/Person.cpp index 818e6ce..6eb59f0 100644 --- a/Source/Person.cpp +++ b/Source/Person.cpp @@ -174,11 +174,6 @@ void Person::CatchFire(){ 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; @@ -194,10 +189,6 @@ bool Person::isSleeping(){ 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