Merge branch 'master' into miami

# Conflicts:
#	src/control/CarAI.cpp
#	src/control/Phones.cpp
#	src/control/Phones.h
#	src/control/Record.cpp
#	src/control/Restart.cpp
#	src/control/Script.cpp
#	src/core/Collision.cpp
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.h
#	src/core/Streaming.cpp
#	src/core/TempColModels.cpp
#	src/core/Wanted.cpp
#	src/core/Zones.cpp
#	src/core/config.h
#	src/core/main.cpp
#	src/core/re3.cpp
#	src/entities/Entity.cpp
#	src/entities/Physical.cpp
#	src/extras/frontendoption.cpp
#	src/modelinfo/ModelInfo.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/CivilianPed.cpp
#	src/peds/CopPed.cpp
#	src/peds/EmergencyPed.cpp
#	src/peds/Ped.cpp
#	src/peds/Ped.h
#	src/peds/Population.cpp
#	src/render/Renderer.cpp
#	src/save/GenericGameStorage.cpp
#	src/skel/win/win.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Boat.cpp
#	src/vehicles/Boat.h
#	src/vehicles/Vehicle.cpp

src/render/Draw.cpp

@@ -3,6 +3,7 @@
 #include "Draw.h"
 #include "Frontend.h"
 #include "Camera.h"
+#include "CutsceneMgr.h"
 
 #ifdef ASPECT_RATIO_SCALE
 float CDraw::ms_fAspectRatio = DEFAULT_ASPECT_RATIO;
@@ -61,7 +62,10 @@ void
 CDraw::SetFOV(float fov)
 {
 #ifdef ASPECT_RATIO_SCALE
-	ms_fScaledFOV = ConvertFOV(fov);
+	if (!CCutsceneMgr::IsRunning())
+		ms_fScaledFOV = ConvertFOV(fov);
+	else
+		ms_fScaledFOV = fov;
 #endif
 	ms_fFOV = fov;
 }

src/render/Renderer.cpp

@@ -779,7 +779,7 @@ CRenderer::ScanWorld(void)
 			ScanSectorPoly(poly, 3, ScanSectorList);
 
 			ScanBigBuildingList(CWorld::GetBigBuildingList(CGame::currLevel));
-			ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_NONE));
+			ScanBigBuildingList(CWorld::GetBigBuildingList(LEVEL_GENERIC));
 		}
 	}
 }