mirror of
https://gitlab.com/GaryOderNichts/re3-wiiu.git
synced 2024-11-23 09:39:16 +01:00
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
This commit is contained in:
commit
75f812cfcd
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user