diff options
| author | Sergeanur <s.anureev@yandex.ua> | 2021-08-11 09:32:59 +0300 |
|---|---|---|
| committer | Sergeanur <s.anureev@yandex.ua> | 2021-08-11 09:32:59 +0300 |
| commit | 75f812cfcd08cddcd01cf58e9fa59d7844cb42c8 (patch) | |
| tree | f270dec50b3cf1837c74fef435be48f9777b8b21 /src/control | |
| parent | 463fdab6a48502b0610f944b9de0853edef3615e (diff) | |
| parent | 1f98f01dcb006783755bd58fa458bb515626b2dd (diff) | |
Merge branch 'master' into miami
# Conflicts:
# src/control/CarCtrl.cpp
# src/control/RoadBlocks.cpp
# src/core/Radar.cpp
# src/core/Radar.h
# src/peds/Ped.cpp
# src/peds/Population.cpp
# src/renderer/Renderer.cpp
# src/vehicles/CarGen.cpp
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/RoadBlocks.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/control/RoadBlocks.cpp b/src/control/RoadBlocks.cpp index 02afb7d8..e30313bf 100644 --- a/src/control/RoadBlocks.cpp +++ b/src/control/RoadBlocks.cpp @@ -60,7 +60,7 @@ CRoadBlocks::GenerateRoadBlockCopsForCar(CVehicle* pVehicle, int32 roadBlockType CEntity* pEntityToAttack = (CEntity*)FindPlayerVehicle(); if (!pEntityToAttack) pEntityToAttack = (CEntity*)FindPlayerPed(); - CColModel *pPoliceColModel = CModelInfo::GetColModel(MI_POLICE); + CColModel* pPoliceColModel = CModelInfo::GetColModel(MI_POLICE); float fRadius = pVehicle->GetBoundRadius() / pPoliceColModel->boundingSphere.radius; for (int32 i = 0; i < 2; i++) { const int32 roadBlockIndex = i + 2 * roadBlockType; |