AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-11 21:36:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow immobile actors to initiate combat when attacked

Browse Source
This commit is contained in:
Aussiemon 2025-04-15 20:02:24 -06:00 committed by Aussiemon
parent 3df695df4a
commit 09ed5bb234
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/openmw/mwclass/creature.cpp
View File

@ -360,9 +360,6 @@ namespace MWClass
{ {
stats.setAttacked(true); stats.setAttacked(true);
// No retaliation for totally static creatures (they have no movement or attacks anyway)
if (isMobile(ptr))
{
bool complain = sourceType == MWMechanics::DamageSourceType::Melee; bool complain = sourceType == MWMechanics::DamageSourceType::Melee;
bool supportFriendlyFire = sourceType != MWMechanics::DamageSourceType::Ranged; bool supportFriendlyFire = sourceType != MWMechanics::DamageSourceType::Ranged;
if (supportFriendlyFire && MWMechanics::friendlyHit(attacker, ptr, complain)) if (supportFriendlyFire && MWMechanics::friendlyHit(attacker, ptr, complain))
@ -370,7 +367,6 @@ namespace MWClass
else else
setOnPcHitMe = MWBase::Environment::get().getMechanicsManager()->actorAttacked(ptr, attacker); setOnPcHitMe = MWBase::Environment::get().getMechanicsManager()->actorAttacked(ptr, attacker);
} }
}
// Attacker and target store each other as hitattemptactor if they have no one stored yet // Attacker and target store each other as hitattemptactor if they have no one stored yet
if (!attacker.isEmpty() && attacker.getClass().isActor()) if (!attacker.isEmpty() && attacker.getClass().isActor())