Merge branch 'master' into miami

# Conflicts:
#	src/core/Game.cpp

src/peds/CopPed.cpp

@@ -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;