From dae2d30d8f6dc9cf4831c1e9df59a42cecfccecf Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Fri, 26 Jul 2019 13:39:56 +0300 Subject: fight fix --- src/peds/Ped.cpp | 4 ++-- 1 file 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; -- cgit v1.2.3