diff options
| author | Filip Gawin <filip.gawin@zoho.com> | 2019-08-02 17:43:40 +0200 |
|---|---|---|
| committer | Filip Gawin <filip.gawin@zoho.com> | 2019-08-27 21:14:28 +0200 |
| commit | 458fc63f0196dc92362b44d5cf7ebf67bbc903e1 (patch) | |
| tree | aa190341ec4d5ee449c80c20fea3c09e4f655532 /src/peds/Ped.cpp | |
| parent | More audio ped (diff) | |
| download | re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.tar re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.tar.gz re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.tar.bz2 re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.tar.lz re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.tar.xz re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.tar.zst re3-458fc63f0196dc92362b44d5cf7ebf67bbc903e1.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/peds/Ped.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 59395d94..209c4ff6 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -1792,7 +1792,7 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase) neededPos.z = autoZPos.z; m_vecMoveSpeed = CVector(0.0f, 0.0f, 0.0f); } else if (neededPos.z <= currentZ && m_pVehicleAnim && vehAnim != ANIM_VAN_CLOSE_L && vehAnim != ANIM_VAN_CLOSE) { - adjustedTimeStep = Min(m_pVehicleAnim->timeStep, 0.1f); + adjustedTimeStep = min(m_pVehicleAnim->timeStep, 0.1f); // Smoothly change ped position neededPos.z = currentZ - (currentZ - neededPos.z) / (m_pVehicleAnim->GetTimeLeft() / adjustedTimeStep); @@ -1807,12 +1807,12 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase) if (m_pVehicleAnim && (vehAnim == ANIM_CAR_GETIN_RHS || vehAnim == ANIM_CAR_GETIN_LOW_RHS || vehAnim == ANIM_CAR_GETIN_LHS || vehAnim == ANIM_CAR_GETIN_LOW_LHS || vehAnim == ANIM_CAR_QJACK || vehAnim == ANIM_VAN_GETIN_L || vehAnim == ANIM_VAN_GETIN)) { - adjustedTimeStep = Min(m_pVehicleAnim->timeStep, 0.1f); + adjustedTimeStep = min(m_pVehicleAnim->timeStep, 0.1f); // Smoothly change ped position neededPos.z = (neededPos.z - currentZ) / (m_pVehicleAnim->GetTimeLeft() / adjustedTimeStep) + currentZ; } else if (m_nPedState == PED_ENTER_CAR || m_nPedState == PED_CARJACK) { - neededPos.z = Max(currentZ, autoZPos.z); + neededPos.z = max(currentZ, autoZPos.z); } } } @@ -4771,12 +4771,12 @@ CPed::FightStrike(CVector &touchedNodePos) float moveMult; if (m_lastFightMove == FIGHTMOVE_GROUNDKICK) { - moveMult = Min(damageMult * 0.6f, 4.0f); + moveMult = min(damageMult * 0.6f, 4.0f); } else { if (nearPed->m_nPedState != PED_DIE || damageMult >= 20) { moveMult = damageMult; } else { - moveMult = Min(damageMult * 2.0f, 14.0f); + moveMult = min(damageMult * 2.0f, 14.0f); } } |