6 files changed, 60 insertions, 2 deletions
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index f0a60093..e9bbb5a7 100644
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@@ -2545,11 +2545,13 @@ CCam::Process_M16_1stPerson(const CVector &CameraTarget, float, float, float)
 		ResetStatics = false;
 	}
 
+#ifndef GTA3_1_1_PATCH
 	((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(&HeadPos, PED_HEAD);
 	Source = HeadPos;
 	Source.z += 0.1f;
 	Source.x -= 0.19f*Cos(m_fInitialPlayerOrientation);
 	Source.y -= 0.19f*Sin(m_fInitialPlayerOrientation);
+#endif
 
 	// Look around
 	bool UseMouse = false;
@@ -2578,6 +2580,17 @@ CCam::Process_M16_1stPerson(const CVector &CameraTarget, float, float, float)
 	if(Alpha > DEGTORAD(60.0f)) Alpha = DEGTORAD(60.0f);
 	if(Alpha < -DEGTORAD(89.5f)) Alpha = -DEGTORAD(89.5f);
 
+#ifdef GTA3_1_1_PATCH
+	HeadPos.x = 0.0f;
+	HeadPos.y = 0.0f;
+	HeadPos.z = 0.0f;
+	((CPed*)CamTargetEntity)->m_pedIK.GetComponentPosition(&HeadPos, PED_HEAD);
+	Source = HeadPos;
+	Source.z += 0.1f;
+	Source.x -= 0.19f * Cos(m_fInitialPlayerOrientation);
+	Source.y -= 0.19f * Sin(m_fInitialPlayerOrientation);
+#endif
+
 	TargetCoors.x = 3.0f * Cos(Alpha) * Cos(Beta) + Source.x;
 	TargetCoors.y = 3.0f * Cos(Alpha) * Sin(Beta) + Source.y;
 	TargetCoors.z = 3.0f * Sin(Alpha) + Source.z;
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index c8eaaa56..9a053056 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -71,11 +71,27 @@ bool bDidWeProcessAnyCinemaCam;
 #define CTRLDOWN(key) ((KEYDOWN(rsLCTRL) || KEYDOWN(rsRCTRL)) && KEYDOWN((RsKeyCodes)key))
 #endif
 
+CCamera::CCamera(void)
+{
+#ifdef GTA3_1_1_PATCH
+	m_fMouseAccelHorzntl = 0.0025f;
+	m_fMouseAccelVertical = 0.003f;
+#endif
+	Init();
+}
+
 void
 CCamera::Init(void)
 {
+#ifdef GTA3_1_1_PATCH
+	float fMouseAccelHorzntl = m_fMouseAccelHorzntl;
+	float fMouseAccelVertical = m_fMouseAccelVertical;
+#endif
 	memset(this, 0, sizeof(CCamera));	// getting rid of vtable, eh?
-
+#ifdef GTA3_1_1_PATCH
+	m_fMouseAccelHorzntl = fMouseAccelHorzntl;
+	m_fMouseAccelVertical = fMouseAccelVertical;
+#endif
 	m_pRwCamera = nil;
 	m_1rstPersonRunCloseToAWall = false;
 	m_fPositionAlongSpline = 0.0f;
@@ -191,8 +207,10 @@ CCamera::Init(void)
 	m_uiTransitionState = 0;
 	m_uiTimeTransitionStart = 0;
 	m_bLookingAtPlayer = true;
+#ifndef GTA3_1_1_PATCH
 	m_fMouseAccelHorzntl = 0.0025f;
 	m_fMouseAccelVertical = 0.003f;
+#endif
 	m_f3rdPersonCHairMultX = 0.53f;
 	m_f3rdPersonCHairMultY = 0.4f;
 }
diff --git a/src/core/Camera.h b/src/core/Camera.h
index d1c8ec03..6d53f417 100644
--- a/src/core/Camera.h
+++ b/src/core/Camera.h
@@ -546,6 +546,7 @@ uint32    unknown;	// some counter having to do with music
 #endif
 
 	// High level and misc
+	CCamera(void);
 	void Init(void);
 	void Process(void);
 	void CamControl(void);
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index c7e7d26e..81560b76 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -2960,8 +2960,10 @@ CMenuManager::LoadAllTextures()
 	CTxdStore::LoadTxd(frontendTxdSlot, "MODELS/FRONTEND.TXD");
 	CTxdStore::AddRef(frontendTxdSlot);
 	CTxdStore::SetCurrentTxd(frontendTxdSlot);
+#ifndef GTA3_1_1_PATCH
 	CStreaming::IHaveUsedStreamingMemory();
 	CTimer::Update();
+#endif
 
 	for (int i = 0; i < ARRAY_SIZE(FrontendFilenames); i++) {
 		m_aFrontEndSprites[i].SetTexture(FrontendFilenames[i][0], FrontendFilenames[i][1]);
@@ -2988,6 +2990,10 @@ CMenuManager::LoadAllTextures()
 		m_aMapSprites[i].SetAddressing(rwTEXTUREADDRESSBORDER);
 	}
 #endif
+#ifdef GTA3_1_1_PATCH
+	CStreaming::IHaveUsedStreamingMemory();
+	CTimer::Update();
+#endif
 	m_bSpritesLoaded = true;
 	CTxdStore::PopCurrentTxd();
 }
@@ -2999,7 +3005,11 @@ CMenuManager::LoadSettings()
 	int fileHandle = CFileMgr::OpenFile("gta3.set", "r");
 
 	int32 prevLang = m_PrefsLanguage;
+#ifdef GTA3_1_1_PATCH
+	CMBlur::BlurOn = (_dwOperatingSystemVersion != OS_WIN98);
+#else
 	CMBlur::BlurOn = true;
+#endif
 	MousePointerStateHelper.bInvertVertically = true;
 
 	// 50 is silly
@@ -4468,7 +4478,18 @@ CMenuManager::ProcessButtonPresses(void)
 						m_PrefsUseWideScreen = false;
 						m_PrefsShowSubtitles = true;
 						m_nDisplayVideoMode = m_nPrefsVideoMode;
+#ifdef GTA3_1_1_PATCH
+						if (_dwOperatingSystemVersion == OS_WIN98) {
+							CMBlur::BlurOn = false;
+							CMBlur::MotionBlurClose();
+						}
+						else {
+							CMBlur::BlurOn = true;
+							CMBlur::MotionBlurOpen(Scene.camera);
+						}
+#else
 						CMBlur::BlurOn = true;
+#endif
 						SaveSettings();
 					} else if ((m_nCurrScreen != MENUPAGE_SKIN_SELECT_OLD) && (m_nCurrScreen == MENUPAGE_CONTROLLER_PC)) {
 						ControlsManager.MakeControllerActionsBlank();
@@ -4998,7 +5019,7 @@ CMenuManager::WaitForUserCD()
 	CSprite2d *splash;
 	char *splashscreen = nil;
 
-#ifndef RANDOMSPLASH
+#if (!(defined RANDOMSPLASH) && !(defined GTA3_1_1_PATCH))
 	if (CGame::frenchGame || CGame::germanGame || !CGame::nastyGame)
 		splashscreen = "mainsc2";
 	else
diff --git a/src/core/Frontend.h b/src/core/Frontend.h
index c7b0c979..ef5279aa 100644
--- a/src/core/Frontend.h
+++ b/src/core/Frontend.h
@@ -646,3 +646,4 @@ public:
 static_assert(sizeof(CMenuManager) == 0x564, "CMenuManager: error");
 
 extern CMenuManager FrontEndMenuManager;
+extern unsigned long _dwOperatingSystemVersion;
+\ No newline at end of file
diff --git a/src/core/templates.h b/src/core/templates.h
index a1627357..51a24e4c 100644
--- a/src/core/templates.h
+++ b/src/core/templates.h
@@ -104,6 +104,10 @@ public:
 		return m_flags[i].free ? nil : (T*)&m_entries[i];
 	}
 	T *GetAt(int handle){
+#ifdef FIX_BUGS
+		if (handle == -1)
+			return nil;
+#endif
 		return m_flags[handle>>8].u == (handle & 0xFF) ?
 		       (T*)&m_entries[handle >> 8] : nil;
 	}