mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-29 17:15:32 +00:00
Code Issues Releases Wiki Activity

[Client] Fix synchronization of knockdown states

Browse source
This commit is contained in:
David Cernat 2018-09-15 04:59:06 +03:00
parent 490303dc0b
commit 33a0886790
2 changed files with 38 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -498,20 +498,31 @@ namespace MWClass
/*
Start of tes3mp change (major)
If the attacker is a DedicatedPlayer or DedicatedActor with a successful knockdown, apply the knockdown;
otherwise, use default probability roll
If the attacker is a DedicatedPlayer or DedicatedActor with a successful knockdown, apply the knockdown
If the attacker is neither of those, then it must be a LocalPlayer or a LocalActor, so calculate the
knockdown probability on our client
Default to hit recovery if no knockdown has taken place, like in regular OpenMW
*/
mwmp::Attack *dedicatedAttack = MechanicsHelper::getDedicatedAttack(attacker);
if (dedicatedAttack && dedicatedAttack->knockdown)
stats.setKnockedDown(true);
else if (ishealth && agilityTerm <= damage && knockdownTerm <= Misc::Rng::roll0to99())
if (dedicatedAttack)
{
if (dedicatedAttack->knockdown)
stats.setKnockedDown(true);
}
else
{
if (ishealth && agilityTerm <= damage && knockdownTerm <= Misc::Rng::roll0to99())
stats.setKnockedDown(true);
}
if (!stats.getKnockedDown())
stats.setHitRecovery(true); // Is this supposed to always occur?
/*
End of tes3mp change (major)
*/
stats.setKnockedDown(true);
else
stats.setHitRecovery(true); // Is this supposed to always occur?
}
damage = std::max(1.f, damage);

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

@ -837,20 +837,31 @@ namespace MWClass
/*
Start of tes3mp change (major)
If the attacker is a DedicatedPlayer or DedicatedActor with a successful knockdown, apply the knockdown;
otherwise, use default probability roll
If the attacker is a DedicatedPlayer or DedicatedActor with a successful knockdown, apply the knockdown
If the attacker is neither of those, then it must be a LocalPlayer or a LocalActor, so calculate the
knockdown probability on our client
Default to hit recovery if no knockdown has taken place, like in regular OpenMW
*/
mwmp::Attack *dedicatedAttack = MechanicsHelper::getDedicatedAttack(attacker);
if (dedicatedAttack && dedicatedAttack->knockdown)
stats.setKnockedDown(true);
else if (ishealth && agilityTerm <= damage && knockdownTerm <= Misc::Rng::roll0to99())
if (dedicatedAttack)
{
if (dedicatedAttack->knockdown)
stats.setKnockedDown(true);
}
else
{
if (ishealth && agilityTerm <= damage && knockdownTerm <= Misc::Rng::roll0to99())
stats.setKnockedDown(true);
}
if (!stats.getKnockedDown())
stats.setHitRecovery(true); // Is this supposed to always occur?
/*
End of tes3mp change (major)
*/
stats.setKnockedDown(true);
else
stats.setHitRecovery(true); // Is this supposed to always occur?
if (damage > 0 && ishealth)
{