Minor changes

actorid
Jeffrey Haines 11 years ago
parent 70919ba60a
commit df5cbe5dec

@ -750,6 +750,7 @@ namespace MWMechanics
{
creatureStats.setAlarmed(false);
creatureStats.setHostile(false);
creatureStats.setAttacked(false);
if (ptr.getClass().isClass(ptr, "Guard"))
creatureStats.getAiSequence().stopPersue();
creatureStats.getAiSequence().stopCombat();

@ -435,8 +435,9 @@ namespace MWMechanics
return getMovementFlag (Flag_Run) || getMovementFlag (Flag_ForceRun);
case Stance_Sneak:
return getMovementFlag (Flag_Sneak) || getMovementFlag (Flag_ForceSneak);
default:
return false;
}
return false; // shut up, compiler
}
DrawState_ CreatureStats::getDrawState() const

@ -840,7 +840,8 @@ namespace MWMechanics
CreatureStats& creatureStats = MWWorld::Class::get(*it).getCreatureStats(*it);
// Was the crime seen?
if ( MWBase::Environment::get().getWorld()->getLOS(ptr, *it) && awarenessCheck(ptr, *it) )
if ( ( MWBase::Environment::get().getWorld()->getLOS(ptr, *it) && awarenessCheck(ptr, *it) ) ||
type == OT_Assault )
{
// Say something!
// TODO: Add more messages
@ -860,7 +861,8 @@ namespace MWMechanics
// Will the witness be affected by the crime?
CreatureStats& creatureStats1 = MWWorld::Class::get(*it1).getCreatureStats(*it1);
if (creatureStats1.getAiSetting(CreatureStats::AI_Alarm).getBase() >= alarm)
if (creatureStats1.getAiSetting(CreatureStats::AI_Alarm).getBase() >= alarm ||
type == OT_Assault)
creatureStats1.setAlarmed(true);
}
break; // Someone saw the crime and everyone has been told

Loading…
Cancel
Save