diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-05 19:22:13 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-05 19:22:13 +0200 |
| commit | 918d6dbf56c78f75ea74cc0f8fbca92dc55bcd86 (patch) | |
| tree | 22572d094b688402dc4039171a083b39049a82c4 /src | |
| parent | skipped one def (diff) | |
| download | re3-918d6dbf56c78f75ea74cc0f8fbca92dc55bcd86.tar re3-918d6dbf56c78f75ea74cc0f8fbca92dc55bcd86.tar.gz re3-918d6dbf56c78f75ea74cc0f8fbca92dc55bcd86.tar.bz2 re3-918d6dbf56c78f75ea74cc0f8fbca92dc55bcd86.tar.lz re3-918d6dbf56c78f75ea74cc0f8fbca92dc55bcd86.tar.xz re3-918d6dbf56c78f75ea74cc0f8fbca92dc55bcd86.tar.zst re3-918d6dbf56c78f75ea74cc0f8fbca92dc55bcd86.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/control/CarAI.cpp | 4 | ||||
| -rw-r--r-- | src/control/CarCtrl.cpp | 6 | ||||
| -rw-r--r-- | src/core/Game.h | 23 |
3 files changed, 29 insertions, 4 deletions
diff --git a/src/control/CarAI.cpp b/src/control/CarAI.cpp index 571a62d2..0330d80d 100644 --- a/src/control/CarAI.cpp +++ b/src/control/CarAI.cpp @@ -146,7 +146,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle) case MISSION_BLOCKPLAYER_CLOSE: if (FindSwitchDistanceFar(pVehicle) >= (FindPlayerCoors() - pVehicle->GetPosition()).Magnitude2D() || pVehicle->AutoPilot.m_bIgnorePathfinding) { - if (FindPlayerVehicle() && FindPlayerVehicle()->GetMoveSpeed().Magnitude() < 0.05f) + if (FindPlayerVehicle() && FindPlayerVehicle()->GetMoveSpeed().Magnitude() < 0.04f) #ifdef FIX_BUGS pVehicle->m_nTimeBlocked += CTimer::GetTimeStepInMilliseconds(); #else @@ -155,7 +155,7 @@ void CCarAI::UpdateCarAI(CVehicle* pVehicle) else pVehicle->m_nTimeBlocked = 0; if (!FindPlayerVehicle() || FindPlayerVehicle()->IsUpsideDown() || - FindPlayerVehicle()->GetMoveSpeed().Magnitude() < 0.05f && pVehicle->m_nTimeBlocked > TIME_COPS_WAIT_TO_EXIT_AFTER_STOPPING) { + FindPlayerVehicle()->GetMoveSpeed().Magnitude() < 0.04f && pVehicle->m_nTimeBlocked > TIME_COPS_WAIT_TO_EXIT_AFTER_STOPPING) { if (pVehicle->bIsLawEnforcer && (pVehicle->GetModelIndex() != MI_RHINO || pVehicle->m_randomSeed > 10000) && (FindPlayerCoors() - pVehicle->GetPosition()).Magnitude2D() < 10.0f) { diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp index f0f95941..39285296 100644 --- a/src/control/CarCtrl.cpp +++ b/src/control/CarCtrl.cpp @@ -90,14 +90,16 @@ uint32 aCarsToKeepTime[MAX_CARS_TO_KEEP]; void CCarCtrl::GenerateRandomCars() { - if (CCutsceneMgr::IsRunning()) + if (CCutsceneMgr::IsRunning()) { + CountDownToCarsAtStart = 2; return; + } if (NumRandomCars < 30){ if (CountDownToCarsAtStart == 0){ GenerateOneRandomCar(); } else if (--CountDownToCarsAtStart == 0) { - for (int i = 0; i < 50; i++) + for (int i = 0; i < 100; i++) GenerateOneRandomCar(); CTheCarGenerators::GenerateEvenIfPlayerIsCloseCounter = 20; } diff --git a/src/core/Game.h b/src/core/Game.h index 8db5adf5..227da56e 100644 --- a/src/core/Game.h +++ b/src/core/Game.h @@ -8,6 +8,29 @@ enum eLevelName { LEVEL_SUBURBAN }; +enum eVisibilityArea +{ + VIS_MAIN_MAP = 0, + VIS_HOTEL, + VIS_MANSION, + VIS_BANK, + VIS_MALL, + VIS_STRIP_CLUB, + VIS_LAWYERS, + VIS_COFFEE_SHOP, + VIS_CONCERT_HALL, + VIS_STUDIO, + VIS_RIFLE_RANGE, + VIS_BIKER_BAR, + VIS_POLICE_STATION, + VIS_EVERYWHERE, + VIS_DIRT, + VIS_BLOOD, + VIS_OVALRING, + VIS_MALIBU_CLUB, + VIS_PRINT_WORKS, +}; + class CGame { public: |