|
|
|
@ -329,6 +329,9 @@ namespace MWClass
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(ptr.getRefData().getHandle() == "player")
|
|
|
|
|
MWBase::Environment::get().getWindowManager()->setEnemy(ptr);
|
|
|
|
|
|
|
|
|
|
int weapskill = ESM::Skill::HandToHand;
|
|
|
|
|
if(!weapon.isEmpty())
|
|
|
|
|
weapskill = MWWorld::Class::get(weapon).getEquipmentSkill(weapon);
|
|
|
|
@ -418,9 +421,6 @@ namespace MWClass
|
|
|
|
|
|
|
|
|
|
// NOTE: 'object' and/or 'attacker' may be empty.
|
|
|
|
|
|
|
|
|
|
if(!attacker.isEmpty() && attacker.getRefData().getHandle() == "player")
|
|
|
|
|
MWBase::Environment::get().getWindowManager()->setEnemy(ptr);
|
|
|
|
|
|
|
|
|
|
if(!successful)
|
|
|
|
|
{
|
|
|
|
|
// TODO: Handle HitAttemptOnMe script function
|
|
|
|
|