Substitute/Re3
Substitute/Re3
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

fight fix

Browse Source
This commit is contained in:
Nikolay Korolev 2019-07-26 13:39:56 +03:00
parent c63de7ec43
commit dae2d30d8f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/peds/Ped.cpp
View File

@ -4588,14 +4588,14 @@ CPed::FightStrike(CVector &touchedNodePos)
// He can beat us // He can beat us
if (sq(maxDistanceToBeBeaten) > potentialAttackDistance.MagnitudeSqr()) { if (sq(maxDistanceToBeBeaten) > potentialAttackDistance.MagnitudeSqr()) {
ourCol = CModelInfo::GetModelInfo(m_modelIndex)->GetColModel(); ourCol = ((CPedModelInfo*)CModelInfo::GetModelInfo(m_modelIndex))->GetHitColModel();
if (nearPed->m_nPedState == PED_FALL if (nearPed->m_nPedState == PED_FALL
|| nearPed->m_nPedState == PED_DEAD || nearPed->m_nPedState == PED_DIE || nearPed->m_nPedState == PED_DEAD || nearPed->m_nPedState == PED_DIE
|| !nearPed->IsPedHeadAbovePos(-0.3f)) { || !nearPed->IsPedHeadAbovePos(-0.3f)) {
ourCol = &CTempColModels::ms_colModelPedGroundHit; ourCol = &CTempColModels::ms_colModelPedGroundHit;
} }
for (int j = 0; j < ourCol->numSpheres; j++) { for (int j = 0; j < ourCol->numSpheres; j++) {
attackDistance = nearPed->GetPosition() - ourCol->spheres[j].center; attackDistance = nearPed->GetPosition() + ourCol->spheres[j].center;
attackDistance -= touchedNodePos; attackDistance -= touchedNodePos;
CColSphere *ourPieces = ourCol->spheres; CColSphere *ourPieces = ourCol->spheres;
float maxDistanceToBeat = ourPieces[j].radius + ms_fightMoves[m_lastFightMove].strikeRadius; float maxDistanceToBeat = ourPieces[j].radius + ms_fightMoves[m_lastFightMove].strikeRadius;