Merge branch 'master' into miami

# Conflicts:
#	src/animation/AnimBlendAssocGroup.cpp
#	src/animation/AnimBlendAssociation.cpp
#	src/animation/AnimManager.cpp
#	src/core/Streaming.cpp

src/animation/AnimBlendAssociation.cpp

@@ -159,6 +159,7 @@ CAnimBlendAssociation::Start(float time)
 	flags |= ASSOC_RUNNING;
 	SetCurrentTime(time);
 }
+
 bool
 CAnimBlendAssociation::UpdateTime(float timeDelta, float relSpeed)
 {

src/core/Cam.cpp

@@ -25,8 +25,6 @@
 #include "Camera.h"
 #include "DMAudio.h"
 
-const float DefaultFOV = 70.0f;	// beta: 80.0f
-
 bool PrintDebugCode = false;
 int16 DebugCamMode;
 

src/core/Camera.h

@@ -40,6 +40,8 @@ enum
 #define DEFAULT_CAR_ZOOM_VALUE_2 (1.9f)
 #define DEFAULT_CAR_ZOOM_VALUE_3 (3.9f)
 
+const float DefaultFOV = 70.0f; // beta: 80.0f
+
 class CCam
 {
 public:

src/render/Sprite.cpp

@@ -29,13 +29,17 @@ CSprite::CalcScreenCoors(const RwV3d &in, RwV3d *out, float *outw, float *outh,
 	float recip = 1.0f/out->z;
 	out->x *= SCREEN_WIDTH * recip;
 	out->y *= SCREEN_HEIGHT * recip;
-	// What is this? size?
-	*outw = 70.0f/CDraw::GetFOV() * SCREEN_WIDTH * recip;
 #ifdef ASPECT_RATIO_SCALE
-	*outh = 70.0f/CDraw::GetFOV() / (DEFAULT_ASPECT_RATIO / SCREEN_ASPECT_RATIO) * SCREEN_HEIGHT * recip;
+	float fov = CDraw::ConvertFOV(DefaultFOV);
 #else
-	*outh = 70.0f/CDraw::GetFOV() * SCREEN_HEIGHT * recip;
+	const float fov = DefaultFOV;
 #endif
+	// this is used to scale correctly if you zoom in with sniper rifle
+	float fovScale = fov / CDraw::GetFOV();
+
+	*outw = fovScale * SCREEN_SCALE_AR(recip) * SCREEN_WIDTH;
+	*outh = fovScale * recip * SCREEN_HEIGHT;
+
 	return true;
 }