summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-26 12:42:26 +0200
committerGitHub <noreply@github.com>2019-07-26 12:42:26 +0200
commit7d6a04b5c60ed69e2f7623b213704db4e71f579a (patch)
tree11a72d636246b0665b7a8d6ea40e83d6d56c5bb0
parentMerge pull request #164 from Nick007J/master (diff)
parentfight fix (diff)
downloadre3-7d6a04b5c60ed69e2f7623b213704db4e71f579a.tar
re3-7d6a04b5c60ed69e2f7623b213704db4e71f579a.tar.gz
re3-7d6a04b5c60ed69e2f7623b213704db4e71f579a.tar.bz2
re3-7d6a04b5c60ed69e2f7623b213704db4e71f579a.tar.lz
re3-7d6a04b5c60ed69e2f7623b213704db4e71f579a.tar.xz
re3-7d6a04b5c60ed69e2f7623b213704db4e71f579a.tar.zst
re3-7d6a04b5c60ed69e2f7623b213704db4e71f579a.zip
Diffstat (limited to '')
-rw-r--r--src/peds/Ped.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index fb9b778f..1972396c 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -4588,14 +4588,14 @@ CPed::FightStrike(CVector &touchedNodePos)
// He can beat us
if (sq(maxDistanceToBeBeaten) > potentialAttackDistance.MagnitudeSqr()) {
- ourCol = CModelInfo::GetModelInfo(m_modelIndex)->GetColModel();
+ ourCol = ((CPedModelInfo*)CModelInfo::GetModelInfo(m_modelIndex))->GetHitColModel();
if (nearPed->m_nPedState == PED_FALL
|| nearPed->m_nPedState == PED_DEAD || nearPed->m_nPedState == PED_DIE
|| !nearPed->IsPedHeadAbovePos(-0.3f)) {
ourCol = &CTempColModels::ms_colModelPedGroundHit;
}
for (int j = 0; j < ourCol->numSpheres; j++) {
- attackDistance = nearPed->GetPosition() - ourCol->spheres[j].center;
+ attackDistance = nearPed->GetPosition() + ourCol->spheres[j].center;
attackDistance -= touchedNodePos;
CColSphere *ourPieces = ourCol->spheres;
float maxDistanceToBeat = ourPieces[j].radius + ms_fightMoves[m_lastFightMove].strikeRadius;