Merge branch 'master' into miami

# Conflicts:
#	src/core/Game.cpp
This commit is contained in:
Sergeanur
2020-05-05 18:33:32 +03:00
15 changed files with 4 additions and 126 deletions

View File

@ -717,7 +717,7 @@ CCopPed::ProcessControl(void)
return;
bool dontShoot = false;
if (GetIsOnScreenAndNotCulled()) {
if (GetIsOnScreen() && CRenderer::IsEntityCullZoneVisible(this)) {
if (((CTimer::GetFrameCounter() + m_randomSeed) & 0x1F) == 17) {
CEntity *foundBuilding = nil;
CColPoint foundCol;