Merge remote-tracking branch 'upstream/miami' into miami

src/core/Camera.cpp

@@ -3182,14 +3182,12 @@ CCamera::GetScreenFadeStatus(void)
 void
 CCamera::RenderMotionBlur(void)
 {
-#ifndef MIAMI	// temporary
 	if(m_BlurType == 0)
 		return;
 
 	CMBlur::MotionBlurRender(m_pRwCamera,
 		m_BlurRed, m_BlurGreen, m_BlurBlue,
-		m_motionBlur, m_BlurType, m_imotionBlurAddAlpha);
-#endif
+		m_motionBlur, m_BlurType);
 }
 
 void

src/core/config.h

@@ -66,7 +66,7 @@ enum Config {
 
 	PATHNODESIZE = 4500,
 
-	NUMWEATHERS = 4,
+	NUMWEATHERS = 7,
 	NUMHOURS = 24,
 
 	NUMEXTRADIRECTIONALS = 4,