From 9896217608d15453d3e2fe0c7a21c16591d0ab49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?eray=20or=C3=A7unus?= Date: Tue, 4 Feb 2020 00:27:48 +0300 Subject: [PATCH] few little things --- src/peds/Ped.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 922de3ce..543dae57 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -2120,18 +2120,16 @@ CPed::SortPeds(CPed **list, int min, int max) int left = max; int right; for(right = min; right <= left; ){ - // Those 1.0s are my addition to make sure loop always run for first time. - for (float rightDist = middleDist-1.0f; middleDist > rightDist; right++) { + float rightDist, leftDist; + do { rightDiff = GetPosition() - list[right]->GetPosition(); rightDist = rightDiff.Magnitude(); - } - right--; + } while (middleDist > rightDist && ++right); - for (float leftDist = middleDist+1.0f; middleDist < leftDist; left--) { + do { leftDiff = GetPosition() - list[left]->GetPosition(); leftDist = leftDiff.Magnitude(); - } - left++; + } while (middleDist < leftDist && left--); if (right <= left) { CPed *ped = list[right]; @@ -13136,10 +13134,9 @@ CPed::ProcessObjective(void) { if (!m_carInObjective || bInVehicle) { #ifdef VC_PED_PORTS - if (bInVehicle && m_pMyVehicle != m_carInObjective) - { + if (bInVehicle && m_pMyVehicle != m_carInObjective) { SetExitCar(m_pMyVehicle, 0); - } + } else #endif { bObjectiveCompleted = true;