mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity

bugfix for lockpick

Browse Source
This commit is contained in:
gus 2013-07-16 14:46:44 +01:00
parent 20341ae8b7
commit 701ff94887
1 changed files with 64 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
apps/openmw/mwmechanics/character.cpp
View File

@ -528,74 +528,77 @@ void CharacterController::update(float duration, Movement &movement)
} }
} }
std::string weapgroup; if(weaptype != WeapType_PickProbe)
getWeaponGroup(mWeaponType, weapgroup);
float weapSpeed = 1;
if(weapon != inv.end()) {weapSpeed = weapon->get<ESM::Weapon>()->mBase->mData.mSpeed;std::cout << "setspeed "<< weapSpeed<< "\n";}
std::string start;
std::string stop;
float complete;
float speedMult;
bool animPlaying = mAnimation->getInfo(weapgroup,&complete,&speedMult,&start,&stop);
if(cls.getCreatureStats(mPtr).getAttackingOrSpell())
{ {
if(mUpperBodyState == UpperCharState_WeapEquiped) std::string weapgroup;
getWeaponGroup(mWeaponType, weapgroup);
float weapSpeed = 1;
if(weapon != inv.end()) weapSpeed = weapon->get<ESM::Weapon>()->mBase->mData.mSpeed;
std::string start;
std::string stop;
float complete;
float speedMult;
bool animPlaying = mAnimation->getInfo(weapgroup,&complete,&speedMult,&start,&stop);
if(cls.getCreatureStats(mPtr).getAttackingOrSpell())
{ {
mAnimation->play(weapgroup, Priority_Weapon, if(mUpperBodyState == UpperCharState_WeapEquiped)
{
mAnimation->play(weapgroup, Priority_Weapon,
MWRender::Animation::Group_UpperBody, false, MWRender::Animation::Group_UpperBody, false,
weapSpeed,"chop start", "chop min attack", 0.0f, 0); weapSpeed,"chop start", "chop min attack", 0.0f, 0);
mUpperBodyState = UpperCharState_ChopStartToMinAttack; mUpperBodyState = UpperCharState_ChopStartToMinAttack;
}
} }
} else if(mUpperBodyState == UpperCharState_ChopMinAttackToMaxAttack)
else if(mUpperBodyState == UpperCharState_ChopMinAttackToMaxAttack) {
{ if(animPlaying)
{
mAnimation->disable(weapgroup);
mAnimation->play(weapgroup, Priority_Weapon,
MWRender::Animation::Group_UpperBody, false,
weapSpeed,"chop max attack", "chop min hit", 1-complete, 0);
}
else
{
mAnimation->play(weapgroup, Priority_Weapon,
MWRender::Animation::Group_UpperBody, false,
weapSpeed,"chop max attack", "chop min hit", 0, 0);
}
mUpperBodyState = UpperCharState_ChopMaxAttackToMinHit;
}
if(mUpperBodyState == UpperCharState_EquipingWeap && !animPlaying) mUpperBodyState = UpperCharState_WeapEquiped;
if(mUpperBodyState == UpperCharState_UnEquipingWeap && !animPlaying) mUpperBodyState = UpperCharState_Nothing;
if(animPlaying) if(animPlaying)
{ {
mAnimation->disable(weapgroup); if(mUpperBodyState == UpperCharState_ChopStartToMinAttack && complete == 1)
mAnimation->play(weapgroup, Priority_Weapon, {
MWRender::Animation::Group_UpperBody, false, mAnimation->disable(weapgroup);
weapSpeed,"chop max attack", "chop min hit", 1-complete, 0); mAnimation->play(weapgroup, Priority_Weapon,
} MWRender::Animation::Group_UpperBody, false,
else weapSpeed,"chop min attack", "chop max attack",0, 0);
{ mUpperBodyState = UpperCharState_ChopMinAttackToMaxAttack;
mAnimation->play(weapgroup, Priority_Weapon, }
MWRender::Animation::Group_UpperBody, false, else if(mUpperBodyState == UpperCharState_ChopMaxAttackToMinHit && complete == 1)
weapSpeed,"chop max attack", "chop min hit", 0, 0); {
} mAnimation->disable(weapgroup);
mUpperBodyState = UpperCharState_ChopMaxAttackToMinHit; mAnimation->play(weapgroup, Priority_Weapon,
} MWRender::Animation::Group_UpperBody, false,
weapSpeed,"chop min hit", "chop hit",0, 0);
if(mUpperBodyState == UpperCharState_EquipingWeap && !animPlaying) mUpperBodyState = UpperCharState_WeapEquiped; mUpperBodyState = UpperCharState_ChopMinHitToHit;
if(mUpperBodyState == UpperCharState_UnEquipingWeap && !animPlaying) mUpperBodyState = UpperCharState_Nothing; }
if(animPlaying) else if(mUpperBodyState == UpperCharState_ChopMinHitToHit && complete == 1)
{ {
if(mUpperBodyState == UpperCharState_ChopStartToMinAttack && complete == 1) mAnimation->disable(weapgroup);
{ mAnimation->play(weapgroup, Priority_Weapon,
mAnimation->disable(weapgroup); MWRender::Animation::Group_UpperBody, false,
mAnimation->play(weapgroup, Priority_Weapon, weapSpeed,"chop large follow start", "chop large follow stop",0, 0);
MWRender::Animation::Group_UpperBody, false, mUpperBodyState = UpperCharState_ChopLargeFollowStartToLargeFollowStop;
weapSpeed,"chop min attack", "chop max attack",0, 0); }
mUpperBodyState = UpperCharState_ChopMinAttackToMaxAttack; else if(mUpperBodyState == UpperCharState_ChopLargeFollowStartToLargeFollowStop && complete == 1)
} {
else if(mUpperBodyState == UpperCharState_ChopMaxAttackToMinHit && complete == 1) mUpperBodyState = UpperCharState_WeapEquiped;
{ }
mAnimation->disable(weapgroup);
mAnimation->play(weapgroup, Priority_Weapon,
MWRender::Animation::Group_UpperBody, false,
weapSpeed,"chop min hit", "chop hit",0, 0);
mUpperBodyState = UpperCharState_ChopMinHitToHit;
}
else if(mUpperBodyState == UpperCharState_ChopMinHitToHit && complete == 1)
{
mAnimation->disable(weapgroup);
mAnimation->play(weapgroup, Priority_Weapon,
MWRender::Animation::Group_UpperBody, false,
weapSpeed,"chop large follow start", "chop large follow stop",0, 0);
mUpperBodyState = UpperCharState_ChopLargeFollowStartToLargeFollowStop;
}
else if(mUpperBodyState == UpperCharState_ChopLargeFollowStartToLargeFollowStop && complete == 1)
{
mUpperBodyState = UpperCharState_WeapEquiped;
} }
} }