Merge remote-tracking branch 'origin/master' into miami

# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/audio/soundlist.h
#	src/control/Script.cpp
#	src/control/ScriptCommands.h
#	src/core/Cam.cpp
#	src/core/Camera.cpp
#	src/core/Camera.h
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.cpp
#	src/core/MenuScreens.cpp
#	src/core/Pad.cpp
#	src/core/Pad.h
#	src/core/config.h
#	src/entities/Entity.cpp
#	src/render/Credits.cpp
#	src/render/Fluff.cpp
#	src/render/Hud.cpp
#	src/render/MBlur.cpp
#	src/render/Timecycle.cpp
#	src/skel/glfw/glfw.cpp
#	src/skel/win/win.cpp
#	src/text/Text.cpp

1 files changed, 16 insertions, 12 deletions

diff --git a/src/core/Camera.h b/src/core/Camera.h
index e0c11981..f9a138b9 100644
--- a/src/core/Camera.h
+++ b/src/core/Camera.h
@@ -186,7 +186,6 @@ public:
 	CPed         *m_pLastPedLookedAt;// So interpolation works 
 	bool        m_bFirstPersonRunAboutActive;
 
-
 	CCam(void) { Init(); }
 	void Init(void);
 	void Process(void);
@@ -295,16 +294,16 @@ enum
 
 enum
 {
-	MBLUR_NONE,
-	MBLUR_SNIPER,
-	MBLUR_NORMAL,
-	MBLUR_INTRO1,		// green camera
-	MBLUR_INTRO2,		// unused
-	MBLUR_INTRO3,		// bank scene
-	MBLUR_INTRO4,		// jail break scene
-	MBLUR_INTRO5,		// explosion
-	MBLUR_INTRO6,		// player shot
-	MBLUR_UNUSED,		// pinkish
+	MOTION_BLUR_NONE = 0,
+	MOTION_BLUR_SNIPER,
+	MOTION_BLUR_LIGHT_SCENE,
+	MOTION_BLUR_SECURITY_CAM,
+	MOTION_BLUR_CUT_SCENE,
+	MOTION_BLUR_INTRO,
+	MOTION_BLUR_INTRO2,
+	MOTION_BLUR_SNIPER_ZOOM,
+	MOTION_BLUR_INTRO3,
+	MOTION_BLUR_INTRO4,
 };
 
 enum
@@ -414,9 +413,12 @@ public:
 	float CarZoomValueSmooth;
 
 	float DistanceToWater;
+#ifndef PS2_CAM_TRANSITION
 	float FOVDuringInter;
+#endif
 	float LODDistMultiplier;
 	float GenerationDistMultiplier;
+#ifndef PS2_CAM_TRANSITION
 	float m_fAlphaSpeedAtStartInter;
 	float m_fAlphaWhenInterPol;
 	float m_fAlphaDuringInterPol;
@@ -427,6 +429,7 @@ public:
 	float m_fFOVSpeedAtStartInter;
 	float m_fStartingBetaForInterPol;
 	float m_fStartingAlphaForInterPol;
+#endif
 	float m_PedOrientForBehindOrInFront;
 	float m_CameraAverageSpeed;
 	float m_CameraSpeedSoFar;
@@ -489,9 +492,11 @@ public:
 	CVector m_vecUpWhenInterPol;
 	CVector m_vecClearGeometryVec;
 	CVector m_vecGameCamPos;
+#ifndef PS2_CAM_TRANSITION
 	CVector SourceDuringInter;
 	CVector TargetDuringInter;
 	CVector UpDuringInter;
+#endif
 	RwCamera *m_pRwCamera;
 	CEntity *pTargetEntity;
 	CCamPathSplines m_arrPathArray[MAX_NUM_OF_SPLINETYPES];
@@ -509,7 +514,6 @@ public:
 	CVector m_vecOldSourceForInter;
 	CVector m_vecOldFrontForInter;
 	CVector m_vecOldUpForInter;
-
 	float m_vecOldFOVForInter;
 	float m_fFLOATingFade;
 	float m_fFLOATingFadeMusic;