X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects%2FPersonType.cpp;h=41d07c2483749444ba3f227c1ad8ac58c656bead;hb=7aa870825c0e851e69703d9730e20db6eb94a675;hp=c1a3aec9a8cd52d7351b3a03dc4552ed4d5eef58;hpb=a4fa4c9e3d7087b3789ff16238089547e78b818f;p=lugaru.git diff --git a/Source/Objects/PersonType.cpp b/Source/Objects/PersonType.cpp index c1a3aec..41d07c2 100644 --- a/Source/Objects/PersonType.cpp +++ b/Source/Objects/PersonType.cpp @@ -24,6 +24,7 @@ std::vector PersonType::types; PersonType::PersonType() { animTalkIdle = tempanim; + animHurtIdle = tempanim; } bool PersonType::hasAnimTalkIdle() @@ -31,6 +32,11 @@ bool PersonType::hasAnimTalkIdle() return (animTalkIdle != tempanim); } +bool PersonType::hasAnimHurtIdle() +{ + return (animHurtIdle != tempanim); +} + void PersonType::Load() { types.resize(2); @@ -81,6 +87,7 @@ void PersonType::Load() types[wolftype].hasClaws = true; types[wolftype].clothes = false; types[wolftype].maxRunSpeed = 75; + types[wolftype].knifeCatchingType = 1; /* Rabbit */ types[rabbittype].proportions[0] = 1.2; @@ -98,6 +105,7 @@ void PersonType::Load() types[rabbittype].animFightIdle = fightidleanim; types[rabbittype].animBounceIdle = bounceidleanim; types[rabbittype].animTalkIdle = talkidleanim; + types[rabbittype].animHurtIdle = hurtidleanim; types[rabbittype].soundsAttack[0] = rabbitattacksound; types[rabbittype].soundsAttack[1] = rabbitattack2sound; @@ -137,4 +145,5 @@ void PersonType::Load() types[rabbittype].hasClaws = false; types[rabbittype].clothes = true; types[rabbittype].maxRunSpeed = 55; + types[rabbittype].knifeCatchingType = 0; }