4 files changed, 21 insertions, 0 deletions

diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 2f977a20..df778815 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -514,7 +514,12 @@ CCamera::Process(void)
 
 		int tableIndex = (int)(DEGTORAD(DrunkAngle)/TWOPI * CParticle::SIN_COS_TABLE_SIZE) & CParticle::SIN_COS_TABLE_SIZE-1;
 		DrunkAngle += 5.0f;
+#ifndef FIX_BUGS
+		// This just messes up interpolation, probably not what they intended
+		// and multiplying the interpolated FOV is also a bit extreme
+		// so let's not do any of this nonsense
 		Cams[ActiveCam].FOV *= (1.0f + CMBlur::Drunkness);
+#endif
 
 		CamSource.x += -0.02f*CMBlur::Drunkness * CParticle::m_CosTable[tableIndex];
 		CamSource.y += -0.02f*CMBlur::Drunkness * CParticle::m_SinTable[tableIndex];
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 7b113d89..ce2194a0 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -90,6 +90,7 @@
 #include "debugmenu.h"
 #include "Ropes.h"
 #include "WindModifiers.h"
+#include "postfx.h"
 
 eLevelName CGame::currLevel;
 int32 CGame::currArea;
@@ -152,6 +153,9 @@ CGame::InitialiseOnceBeforeRW(void)
 	CFileMgr::Initialise();
 	CdStreamInit(MAX_CDCHANNELS);
 	ValidateVersion();
+#ifdef EXTENDED_COLOURFILTER
+	CPostFX::InitOnce();
+#endif
 	return true;
 }
 
diff --git a/src/core/config.h b/src/core/config.h
index 469f9017..eadbc307 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -225,6 +225,7 @@ enum Config {
 //#define NO_ISLAND_LOADING  // disable loadscreen between islands via loading all island data at once, consumes more memory and CPU
 //#define USE_TEXTURE_POOL
 #define CUTSCENE_BORDERS_SWITCH
+//#define EXTENDED_COLOURFILTER		// more options for colour filter (replaces mblur)
 
 // Water & Particle
 #define PC_PARTICLE
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 9d10193d..34fbb428 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -33,6 +33,8 @@
 #include "WaterLevel.h"
 #include "main.h"
 #include "Script.h"
+#include "MBlur.h"
+#include "postfx.h"
 
 #ifndef _WIN32
 #include "assert.h"
@@ -515,6 +517,15 @@ DebugMenuPopulate(void)
 		DebugMenuAddVarBool8("Render", "Frame limiter", &FrontEndMenuManager.m_PrefsFrameLimiter, nil);
 		DebugMenuAddVarBool8("Render", "VSynch", &FrontEndMenuManager.m_PrefsVsync, nil);
 		DebugMenuAddVar("Render", "Max FPS", &RsGlobal.maxFPS, nil, 1, 1, 1000, nil);
+#ifdef EXTENDED_COLOURFILTER
+		static const char *filternames[] = { "None", "Simple", "Normal", "Mobile" };
+		e = DebugMenuAddVar("Render", "Colourfilter", &CPostFX::EffectSwitch, nil, 1, CPostFX::POSTFX_OFF, CPostFX::POSTFX_MOBILE, filternames);
+		DebugMenuEntrySetWrap(e, true);
+		DebugMenuAddVar("Render", "Intensity", &CPostFX::Intensity, nil, 0.05f, 0, 10.0f);
+		DebugMenuAddVarBool8("Render", "Blur", &CPostFX::BlurOn, nil);
+		DebugMenuAddVarBool8("Render", "Motion Blur", &CPostFX::MotionBlurOn, nil);
+#endif
+		DebugMenuAddVar("Render", "Drunkness", &CMBlur::Drunkness, nil, 0.05f, 0, 1.0f);
 		DebugMenuAddVarBool8("Render", "Occlusion debug", &bDisplayOccDebugStuff, nil);
 		DebugMenuAddVarBool8("Render", "Show Ped Paths", &gbShowPedPaths, nil);
 		DebugMenuAddVarBool8("Render", "Show Car Paths", &gbShowCarPaths, nil);