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

# Conflicts:
#	src/control/Script.cpp
#	src/core/Cam.cpp
#	src/core/Camera.cpp
#	src/core/Camera.h
#	src/render/Fluff.cpp
#	src/render/Hud.cpp

src/render/Hud.cpp

@@ -154,8 +154,8 @@ void CHud::Draw()
 		return;
 
 	if (m_Wants_To_Draw_Hud && !TheCamera.m_WideScreenOn) {
-		bool DrawCrossHair = 0;
-		bool DrawCrossHairPC = 0;
+		bool DrawCrossHair = false;
+		bool DrawCrossHairPC = false;
 
 		CPlayerPed *playerPed = FindPlayerPed();
 		eWeaponType WeaponType = playerPed->GetWeapon()->m_eWeaponType;