6 files changed, 148 insertions, 59 deletions

diff --git a/src/render/Credits.cpp b/src/render/Credits.cpp
index 60e69583..07d8e6e5 100644
--- a/src/render/Credits.cpp
+++ b/src/render/Credits.cpp
@@ -128,12 +128,12 @@ CCredits::Render(void)
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED040"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.4f, 0.82f, TheText.Get("CRED041"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.5, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED042"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED043"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.5, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED044"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
@@ -176,7 +176,7 @@ CCredits::Render(void)
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED061"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.5, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED062"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
@@ -191,7 +191,7 @@ CCredits::Render(void)
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED068"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED069"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.5, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED070"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
@@ -220,7 +220,7 @@ CCredits::Render(void)
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED262"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED085"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.5, lineoffset);
 	PrintCreditText(1.7f, 1.7f, TheText.Get("CRED086"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
@@ -265,76 +265,76 @@ CCredits::Render(void)
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED108"), lineoffset, scrolloffset);
 	PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED109"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED110"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
 	PrintCreditText(1.7f, 1.0f, TheText.Get("CRED111"), lineoffset, scrolloffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED112"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED113"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED114"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED115"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED116"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED117"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED118"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED119"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED120"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED121"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED122"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED123"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED124"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED125"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED126"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED127"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED128"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED129"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED130"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED131"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED132"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED133"), lineoffset, scrolloffset);
-	if(FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_ITALIAN)
+	if(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_ITALIAN)
 	        PrintCreditSpace(1.0, lineoffset);
 	PrintCreditText(1.0, 1.0, TheText.Get("CRED134"), lineoffset, scrolloffset);
 	PrintCreditSpace(2.0f, lineoffset);
diff --git a/src/render/Fluff.cpp b/src/render/Fluff.cpp
index d851cae0..53b06a46 100644
--- a/src/render/Fluff.cpp
+++ b/src/render/Fluff.cpp
@@ -404,7 +404,7 @@ void CScrollBar::Update()
 					m_pMessage = FindTimeMessage();
 					break;
 				case 6:
-					if (FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_FRENCH || FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_GERMAN)
+					if (FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_FRENCH || FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_GERMAN)
 						m_pMessage = FindTimeMessage();
 					else
 						m_pMessage = "WWW.GRANDTHEFTAUTO3.COM    ";
@@ -624,7 +624,7 @@ void CScrollBar::Update()
 					m_pMessage = "FREE FLUFFY DICE WITH ALL PURCHASES. . .";
 					break;
 				case 9:
-					if (FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_FRENCH || FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_GERMAN)
+					if (FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_FRENCH || FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_GERMAN)
 						m_pMessage = "QUICK, TAKE A LOOK AT OUR CURRENT STOCK )CAUSE THESE AUTOS ARE MOVIN) FAST . . .  ";
 					else
 						m_pMessage = "HTTP:((ROCKSTARGAMES.COM(GRANDTHEFTAUTO3(CAPITALAUTOS    ";
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp
index f3ea921b..d4cea597 100644
--- a/src/render/Hud.cpp
+++ b/src/render/Hud.cpp
@@ -591,7 +591,7 @@ void CHud::Draw()
 					CFont::SetPropOn();
 					CFont::SetBackgroundOff();
 
-					if (FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_SPANISH)
+					if (FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_SPANISH)
 						CFont::SetScale(SCREEN_SCALE_X(1.7f * 0.8f), SCREEN_SCALE_Y(1.8f));
 					else
 						CFont::SetScale(SCREEN_SCALE_X(1.7f), SCREEN_SCALE_Y(1.8f));
@@ -690,7 +690,7 @@ void CHud::Draw()
 					CFont::SetPropOn();
 					CFont::SetBackgroundOff();
 
-					if (FrontEndMenuManager.m_PrefsLanguage != LANGUAGE_ITALIAN && FrontEndMenuManager.m_PrefsLanguage != LANGUAGE_SPANISH)
+					if (FrontEndMenuManager.m_PrefsLanguage != CMenuManager::LANGUAGE_ITALIAN && FrontEndMenuManager.m_PrefsLanguage != CMenuManager::LANGUAGE_SPANISH)
 						CFont::SetScale(SCREEN_SCALE_X(1.7f), SCREEN_SCALE_Y(1.8f));
 					else
 						CFont::SetScale(SCREEN_SCALE_X(1.7f * 0.85f), SCREEN_SCALE_Y(1.8f));
@@ -1406,7 +1406,7 @@ void CHud::DrawAfterFade()
 			CFont::SetJustifyOff();
 			CFont::SetBackgroundOff();
 
-			if (CGame::frenchGame || FrontEndMenuManager.m_PrefsLanguage == LANGUAGE_SPANISH)
+			if (CGame::frenchGame || FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_SPANISH)
 				CFont::SetScale(SCREEN_SCALE_X(0.884f), SCREEN_SCALE_Y(1.36f));
 			else
 				CFont::SetScale(SCREEN_SCALE_X(1.04f), SCREEN_SCALE_Y(1.6f));
diff --git a/src/render/MBlur.cpp b/src/render/MBlur.cpp
index ec99b90f..a953afd6 100644
--- a/src/render/MBlur.cpp
+++ b/src/render/MBlur.cpp
@@ -1,3 +1,4 @@
+#define WITHWINDOWS
 #include "common.h"
 
 #include "RwHelper.h"
@@ -9,6 +10,7 @@
 
 RwRaster *CMBlur::pFrontBuffer;
 bool CMBlur::ms_bJustInitialised;
+bool CMBlur::ms_bScaledBlur;
 bool CMBlur::BlurOn;
 float CMBlur::Drunkness;
 
@@ -16,43 +18,123 @@ static RwIm2DVertex Vertex[4];
 static RwIm2DVertex Vertex2[4];
 static RwImVertexIndex Index[6] = { 0, 1, 2, 0, 2, 3 };
 
-void
+RwBool
 CMBlur::MotionBlurOpen(RwCamera *cam)
 {
-	// TODO. this is simplified
-
+#ifdef GTA_PS2
+	RwRect rect = {0, 0, 0, 0};
+	
+	if (pFrontBuffer)
+		return TRUE;
+	
+	BlurOn = true;
+	
+	rect.w = RwRasterGetWidth(RwCameraGetRaster(cam));
+	rect.h = RwRasterGetHeight(RwCameraGetRaster(cam));
+	
+	pFrontBuffer = RwRasterCreate(0, 0, 0, rwRASTERDONTALLOCATE|rwRASTERTYPECAMERATEXTURE);
+	if (!pFrontBuffer)
+	{
+		printf("Error creating raster\n");
+		return FALSE;
+	}
+	
+	RwRaster *raster = RwRasterSubRaster(pFrontBuffer, RwCameraGetRaster(cam), &rect);
+	if (!raster)
+	{
+		RwRasterDestroy(pFrontBuffer);
+		pFrontBuffer = NULL;
+		printf("Error subrastering\n");
+		return FALSE;
+	}
+	
+	CreateImmediateModeData(cam, &rect);
+#else
 	RwRect rect = { 0, 0, 0, 0 };
 
 	if(pFrontBuffer)
 		MotionBlurClose();
-
-	if(BlurOn){
-		for(rect.w = 1; rect.w < RwRasterGetWidth(RwCameraGetRaster(cam)); rect.w *= 2);
-		for(rect.h = 1; rect.h < RwRasterGetHeight(RwCameraGetRaster(cam)); rect.h *= 2);
-		pFrontBuffer = RwRasterCreate(rect.w, rect.h, RwRasterGetDepth(RwCameraGetRaster(cam)), rwRASTERTYPECAMERATEXTURE);
-		if(pFrontBuffer)
-			ms_bJustInitialised = true;
-		else{
-			debug("MBlurOpen can't create raster.");
+	
+#ifndef LIBRW
+	extern void _GetVideoMemInfo(LPDWORD total, LPDWORD avaible);
+	DWORD total, avaible;
+	
+	_GetVideoMemInfo(&total, &avaible);
+	debug("Available video memory %d\n", avaible);
+#endif
+		
+	if(BlurOn)
+	{
+		int32 width  = Pow(2.0f, int32(log2(RwRasterGetWidth (RwCameraGetRaster(cam))))+1);
+		int32 height = Pow(2.0f, int32(log2(RwRasterGetHeight(RwCameraGetRaster(cam))))+1);
+		int32 depth  = RwRasterGetDepth(RwCameraGetRaster(cam));
+		
+#ifndef LIBRW
+		extern D3DCAPS8 _RwD3D8DeviceCaps;
+		extern DWORD _dwMemTotalVideo;
+		if ( _RwD3D8DeviceCaps.MaxTextureWidth >= width && _RwD3D8DeviceCaps.MaxTextureHeight >= height )
+		{
+			total = _dwMemTotalVideo - 3 *
+				( RwRasterGetDepth(RwCameraGetRaster(cam))
+				* RwRasterGetHeight(RwCameraGetRaster(cam))
+				* RwRasterGetWidth(RwCameraGetRaster(cam)) / 8 );
+			BlurOn = total >= height*width*(depth/8) + (12*1024*1024) /*12 MB*/;
+		}
+		else
 			BlurOn = false;
+#endif
+		
+		if ( BlurOn )
+		{
+			ms_bScaledBlur = false;
+			rect.w = width;
+			rect.h = height;
+			
+			pFrontBuffer = RwRasterCreate(rect.w, rect.h, depth, rwRASTERTYPECAMERATEXTURE);
+			if ( !pFrontBuffer )
+			{
+				debug("MBlurOpen can't create raster.");
+				BlurOn = false;
+				rect.w = RwRasterGetWidth(RwCameraGetRaster(cam));
+				rect.h = RwRasterGetHeight(RwCameraGetRaster(cam));
+			}
+			else
+				ms_bJustInitialised = true;
+		}
+		else
+		{
 			rect.w = RwRasterGetWidth(RwCameraGetRaster(cam));
 			rect.h = RwRasterGetHeight(RwCameraGetRaster(cam));
 		}
+		
+#ifndef LIBRW
+		_GetVideoMemInfo(&total, &avaible);
+		debug("Available video memory %d\n", avaible);
+#endif
 		CreateImmediateModeData(cam, &rect);
-	}else{
+	}
+	else
+	{
 		rect.w = RwRasterGetWidth(RwCameraGetRaster(cam));
 		rect.h = RwRasterGetHeight(RwCameraGetRaster(cam));
 		CreateImmediateModeData(cam, &rect);
 	}
+	
+	return TRUE;
+#endif
 }
 
-void
+RwBool
 CMBlur::MotionBlurClose(void)
 {
 	if(pFrontBuffer){
 		RwRasterDestroy(pFrontBuffer);
 		pFrontBuffer = nil;
+		
+		return TRUE;
 	}
+	
+	return FALSE;
 }
 
 void
@@ -149,6 +231,10 @@ void
 CMBlur::MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 alpha)
 {
 	RwRGBA color = { (RwUInt8)red, (RwUInt8)green, (RwUInt8)blue, (RwUInt8)blur };
+#ifdef GTA_PS2
+	if( pFrontBuffer )
+		OverlayRender(cam, pFrontBuffer, color, type, addalpha);
+#else
 	if(ms_bJustInitialised)
 		ms_bJustInitialised = false;
 	else
@@ -158,6 +244,7 @@ CMBlur::MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, u
 		RwRasterRenderFast(RwCameraGetRaster(cam), 0, 0);
 		RwRasterPopContext();
 	}
+#endif
 }
 
 void
@@ -172,32 +259,33 @@ CMBlur::OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type,
 
 	DefinedState();
 
-	switch(type){
-	case MBLUR_INTRO1:
+	switch(type)
+	{
+	case MOTION_BLUR_SECURITY_CAM:
 		r = 0;
 		g = 255;
 		b = 0;
 		a = 128;
 		break;
-	case MBLUR_INTRO3:
+	case MOTION_BLUR_INTRO:
 		r = 100;
 		g = 220;
 		b = 230;
 		a = 158;
 		break;
-	case MBLUR_INTRO4:
+	case MOTION_BLUR_INTRO2:
 		r = 80;
 		g = 255;
 		b = 230;
 		a = 138;
 		break;
-	case MBLUR_INTRO6:
+	case MOTION_BLUR_INTRO3:
 		r = 255;
 		g = 60;
 		b = 60;
 		a = 200;
 		break;
-	case MBLUR_UNUSED:
+	case MOTION_BLUR_INTRO4:
 		r = 255;
 		g = 180;
 		b = 180;
@@ -210,7 +298,7 @@ CMBlur::OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type,
 		int ovR = r * 0.6f;
 		int ovG = g * 0.6f;
 		int ovB = b * 0.6f;
-		int ovA = type == MBLUR_SNIPER ? a : a*0.6f;
+		int ovA = type == MOTION_BLUR_SNIPER ? a : a*0.6f;
 		RwIm2DVertexSetIntRGBA(&Vertex[0], ovR, ovG, ovB, ovA);
 		RwIm2DVertexSetIntRGBA(&Vertex[1], ovR, ovG, ovB, ovA);
 		RwIm2DVertexSetIntRGBA(&Vertex[2], ovR, ovG, ovB, ovA);
@@ -237,7 +325,7 @@ CMBlur::OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type,
 	RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDONE);
 
 	if(BlurOn){
-		if(type == MBLUR_SNIPER){
+		if(type == MOTION_BLUR_SNIPER){
 			RwIm2DVertexSetIntRGBA(&Vertex2[0], r, g, b, 80);
 			RwIm2DVertexSetIntRGBA(&Vertex2[1], r, g, b, 80);
 			RwIm2DVertexSetIntRGBA(&Vertex2[2], r, g, b, 80);
diff --git a/src/render/MBlur.h b/src/render/MBlur.h
index ac298c22..13dbea1f 100644
--- a/src/render/MBlur.h
+++ b/src/render/MBlur.h
@@ -15,12 +15,13 @@ class CMBlur
 public:
 	static RwRaster *pFrontBuffer;
 	static bool ms_bJustInitialised;
+	static bool ms_bScaledBlur;
 	static bool BlurOn;
 	static float Drunkness;
 
 public:
-	static void MotionBlurOpen(RwCamera *cam);
-	static void MotionBlurClose(void);
+	static RwBool MotionBlurOpen(RwCamera *cam);
+	static RwBool MotionBlurClose(void);
 	static void CreateImmediateModeData(RwCamera *cam, RwRect *rect);
 	static void MotionBlurRender(RwCamera *cam, uint32 red, uint32 green, uint32 blue, uint32 blur, int32 type, uint32 alpha);
 	static void OverlayRender(RwCamera *cam, RwRaster *raster, RwRGBA color, int32 type, int32 alpha);
diff --git a/src/render/Timecycle.cpp b/src/render/Timecycle.cpp
index bf55d7bc..fe898412 100644
--- a/src/render/Timecycle.cpp
+++ b/src/render/Timecycle.cpp
@@ -362,8 +362,8 @@ CTimeCycle::Update(void)
 
 	// TODO(MIAMI): extra colours
 
-	if(TheCamera.m_BlurType == MBLUR_NONE || TheCamera.m_BlurType == MBLUR_NORMAL)
-		TheCamera.SetMotionBlur(m_fCurrentBlurRed, m_fCurrentBlurGreen, m_fCurrentBlurBlue, 5, MBLUR_NORMAL);
+	if(TheCamera.m_BlurType == MOTION_BLUR_NONE || TheCamera.m_BlurType == MOTION_BLUR_LIGHT_SCENE)
+		TheCamera.SetMotionBlur(m_fCurrentBlurRed, m_fCurrentBlurGreen, m_fCurrentBlurBlue, 5, MOTION_BLUR_LIGHT_SCENE);
 
 	m_nCurrentFogColourRed = (m_nCurrentSkyTopRed + 2*m_nCurrentSkyBottomRed) / 3;
 	m_nCurrentFogColourGreen = (m_nCurrentSkyTopGreen + 2*m_nCurrentSkyBottomGreen) / 3;