mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 17:49:41 +00:00
Code Issues Releases Wiki Activity

Minor changes

Browse source
This commit is contained in:
Jeffrey Haines 2014-04-04 08:10:35 -04:00
parent 70919ba60a
commit df5cbe5dec
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/openmw/mwmechanics/actors.cpp
View file

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

3
apps/openmw/mwmechanics/creaturestats.cpp
View file

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

6
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View file

@ -840,7 +840,8 @@ namespace MWMechanics
CreatureStats& creatureStats = MWWorld::Class::get(*it).getCreatureStats(*it); CreatureStats& creatureStats = MWWorld::Class::get(*it).getCreatureStats(*it);
// Was the crime seen? // 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! // Say something!
// TODO: Add more messages // TODO: Add more messages
@ -860,7 +861,8 @@ namespace MWMechanics
// Will the witness be affected by the crime? // Will the witness be affected by the crime?
CreatureStats& creatureStats1 = MWWorld::Class::get(*it1).getCreatureStats(*it1); 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); creatureStats1.setAlarmed(true);
} }
break; // Someone saw the crime and everyone has been told break; // Someone saw the crime and everyone has been told