mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-27 10:06:49 +00:00
Code Issues Releases Wiki Activity

Merge branch 'blockofcoal' into 'master'

Browse source 
Play blocked hit sound on the victim, not the attacker

See merge request OpenMW/openmw!2551
This commit is contained in:
psi29a 2022-12-27 13:20:04 +00:00
commit 8b0eba8906
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/mwclass/creature.cpp
View file

@ -357,7 +357,7 @@ namespace MWClass
if (MWMechanics::blockMeleeAttack(ptr, victim, weapon, damage, attackStrength)) if (MWMechanics::blockMeleeAttack(ptr, victim, weapon, damage, attackStrength))
{ {
damage = 0; damage = 0;
block(ptr); victim.getClass().block(victim);
} }
MWMechanics::diseaseContact(victim, ptr); MWMechanics::diseaseContact(victim, ptr);

2
apps/openmw/mwclass/npc.cpp
View file

@ -702,7 +702,7 @@ namespace MWClass
if (MWMechanics::blockMeleeAttack(ptr, victim, weapon, damage, attackStrength)) if (MWMechanics::blockMeleeAttack(ptr, victim, weapon, damage, attackStrength))
{ {
damage = 0; damage = 0;
block(ptr); victim.getClass().block(victim);
} }
if (victim == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState()) if (victim == MWMechanics::getPlayer() && MWBase::Environment::get().getWorld()->getGodModeState())