teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 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

5
apps/openmw/mwmechanics/character.cpp
View file

@ -528,10 +528,12 @@ void CharacterController::update(float duration, Movement &movement)
} }
} }
if(weaptype != WeapType_PickProbe)
{
std::string weapgroup; std::string weapgroup;
getWeaponGroup(mWeaponType, weapgroup); getWeaponGroup(mWeaponType, weapgroup);
float weapSpeed = 1; float weapSpeed = 1;
if(weapon != inv.end()) {weapSpeed = weapon->get<ESM::Weapon>()->mBase->mData.mSpeed;std::cout << "setspeed "<< weapSpeed<< "\n";} if(weapon != inv.end()) weapSpeed = weapon->get<ESM::Weapon>()->mBase->mData.mSpeed;
std::string start; std::string start;
std::string stop; std::string stop;
float complete; float complete;
@ -598,6 +600,7 @@ void CharacterController::update(float duration, Movement &movement)
mUpperBodyState = UpperCharState_WeapEquiped; mUpperBodyState = UpperCharState_WeapEquiped;
} }
} }
}
MWWorld::ContainerStoreIterator torch = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft); MWWorld::ContainerStoreIterator torch = inv.getSlot(MWWorld::InventoryStore::Slot_CarriedLeft);
if(torch != inv.end() && torch->getTypeName() == typeid(ESM::Light).name()) if(torch != inv.end() && torch->getTypeName() == typeid(ESM::Light).name())