14 files changed, 30 insertions, 10 deletions

diff --git a/src/control/CarCtrl.cpp b/src/control/CarCtrl.cpp
index 88fc92f3..cf8e63f4 100644
--- a/src/control/CarCtrl.cpp
+++ b/src/control/CarCtrl.cpp
@@ -1904,7 +1904,7 @@ void CCarCtrl::PickNextNodeRandomly(CVehicle* pVehicle)
 		pCurLink->GetY() - ((pVehicle->AutoPilot.m_nCurrentLane + pCurLink->OneWayLaneOffset()) * LANE_WIDTH) * currentPathLinkForwardX,
 		0.0f);
 	CVector positionOnNextLinkIncludingLane(
-		pNextLink->GetX() + ((pVehicle->AutoPilot.m_nNextLane + pNextLink->OneWayLaneOffset()) * LANE_WIDTH),
+		pNextLink->GetX() + ((pVehicle->AutoPilot.m_nNextLane + pNextLink->OneWayLaneOffset()) * LANE_WIDTH) * nextPathLinkForwardY,
 		pNextLink->GetY() - ((pVehicle->AutoPilot.m_nNextLane + pNextLink->OneWayLaneOffset()) * LANE_WIDTH) * nextPathLinkForwardX,
 		0.0f);
 #endif
diff --git a/src/core/AnimViewer.cpp b/src/core/AnimViewer.cpp
index 00d39066..40a8b09e 100644
--- a/src/core/AnimViewer.cpp
+++ b/src/core/AnimViewer.cpp
@@ -248,8 +248,9 @@ CAnimViewer::Update(void)
 	}
 	CPad::UpdatePads();
 	CPad* pad = CPad::GetPad(0);
-
+#ifdef DEBUGMENU
 	DebugMenuProcess();
+#endif
 
 	CStreaming::UpdateForAnimViewer();
 	CStreaming::RequestModel(modelId, 0);
diff --git a/src/core/Cam.cpp b/src/core/Cam.cpp
index f7749712..ae7df51f 100644
--- a/src/core/Cam.cpp
+++ b/src/core/Cam.cpp
@@ -29,7 +29,7 @@ bool PrintDebugCode = false;
 int16 DebugCamMode;
 
 #ifdef FREE_CAM
-bool CCamera::bFreeCam = false;
+bool CCamera::bFreeCam = true;
 int nPreviousMode = -1;
 #endif
 
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 22d4de99..3ea85659 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -604,8 +604,9 @@ void CGame::Process(void)
 	TheCamera.SetMotionBlurAlpha(0);
 	if (TheCamera.m_BlurType == MBLUR_NONE || TheCamera.m_BlurType == MBLUR_SNIPER || TheCamera.m_BlurType == MBLUR_NORMAL)
 		TheCamera.SetMotionBlur(0, 0, 0, 0, MBLUR_NONE);
-
+#ifdef DEBUGMENU
 	DebugMenuProcess();
+#endif
 	CCutsceneMgr::Update();
 	if (!CCutsceneMgr::IsCutsceneProcessing() && !CTimer::GetIsCodePaused())
 		FrontEndMenuManager.Process();
diff --git a/src/core/Placeable.h b/src/core/Placeable.h
index 26a2291a..7e858283 100644
--- a/src/core/Placeable.h
+++ b/src/core/Placeable.h
@@ -16,7 +16,7 @@ public:
 		m_matrix.GetPosition().y = y;
 		m_matrix.GetPosition().z = z;
 	}
-	void SetPosition(const CVector& pos) { m_matrix.GetPosition() = pos; }
+	void SetPosition(const CVector &pos) { m_matrix.GetPosition() = pos; }
 	CVector &GetRight(void) { return m_matrix.GetRight(); }
 	CVector &GetForward(void) { return m_matrix.GetForward(); }
 	CVector &GetUp(void) { return m_matrix.GetUp(); }
diff --git a/src/core/config.h b/src/core/config.h
index 2ded57bf..dd4628d5 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -186,6 +186,7 @@ enum Config {
 #	define NO_MOVIES	// disable intro videos
 #	define NO_CDCHECK
 #	define CHATTYSPLASH	// print what the game is loading
+#	define DEBUGMENU
 //#	define TIMEBARS		// print debug timers
 #endif
 
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 9e0fda15..6bf8228d 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -91,7 +91,9 @@ void GameInit(void);
 void SystemInit(void);
 void TheGame(void);
 
+#ifdef DEBUGMENU
 void DebugMenuPopulate(void);
+#endif
 
 
 void
@@ -328,11 +330,10 @@ Initialise3D(void *param)
 {
 	if (RsRwInitialise(param))
 	{
-		//
+#ifdef DEBUGMENU
 		DebugMenuInit();
 		DebugMenuPopulate();
-		//
-
+#endif // !DEBUGMENU
 		return CGame::InitialiseRenderWare();
 	}
 
@@ -343,8 +344,9 @@ static void
 Terminate3D(void)
 {
 	CGame::ShutdownRenderWare();
-
+#ifdef DEBUGMENU
 	DebugMenuShutdown();
+#endif // !DEBUGMENU
 	
 	RsRwTerminate();
 
@@ -878,7 +880,9 @@ Render2dStuff(void)
 	CPad::PrintErrorMessage();
 	CFont::DrawFonts();
 
+#ifdef DEBUGMENU
 	DebugMenuRender();
+#endif
 }
 
 void
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index c221d64b..a2c0a9a3 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -61,6 +61,7 @@ mysrand(unsigned int seed)
 	myrand_seed = seed;
 }
 
+#ifdef DEBUGMENU
 void WeaponCheat();
 void HealthCheat();
 void TankCheat();
@@ -386,6 +387,7 @@ DebugMenuPopulate(void)
 		CTweakVars::AddDBG("Debug");
 	}
 }
+#endif
 
 const int   re3_buffsize = 1024;
 static char re3_buff[re3_buffsize];
diff --git a/src/extras/debugmenu.cpp b/src/extras/debugmenu.cpp
index bb0ed55e..a31426bb 100644
--- a/src/extras/debugmenu.cpp
+++ b/src/extras/debugmenu.cpp
@@ -1,4 +1,5 @@
 #include "common.h"
+#ifdef DEBUGMENU
 #include "RwHelper.h"
 #include "Pad.h"
 #include "ControllerConfig.h"
@@ -1313,3 +1314,4 @@ DebugMenuEntrySetAddress(MenuEntry *e, void *addr)
 			((MenuEntry_Float32*)e)->variable = (float*)addr;
 	}
 }
+#endif
\ No newline at end of file
diff --git a/src/extras/debugmenu.h b/src/extras/debugmenu.h
index ae595c1f..eb56c8f9 100644
--- a/src/extras/debugmenu.h
+++ b/src/extras/debugmenu.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#ifdef DEBUGMENU
+
 typedef void (*TriggerFunc)(void);
 
 struct Menu;
@@ -85,3 +87,4 @@ inline DebugMenuEntry *DebugMenuAddVarBool8(const char *path, const char *name,
 {
 	return DebugMenuAddVarBool8(path, name, (int8_t*)ptr, triggerFunc);
 }
+#endif
\ No newline at end of file
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index fd4f9f58..f538f0a4 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -3856,7 +3856,7 @@ CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPi
 					if (IsPedHeadAbovePos(-0.3f)) {
 						dieAnim = NUM_ANIMS;
 					} else {
-						if (RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_FLAG800))
+					    if (RpAnimBlendClumpGetFirstAssociation(GetClump(), ASSOC_FRONTAL))
 							dieAnim = ANIM_FLOOR_HIT_F;
 						else
 							dieAnim = ANIM_FLOOR_HIT;
diff --git a/src/render/Particle.cpp b/src/render/Particle.cpp
index c855c860..5995432b 100644
--- a/src/render/Particle.cpp
+++ b/src/render/Particle.cpp
@@ -222,10 +222,12 @@ int32 Randomizer;
 int32 nParticleCreationInterval = 1;
 float fParticleScaleLimit       = 0.5f;
 
+#ifdef DEBUGMENU
 SETTWEAKPATH("Particle");
 TWEAKINT32(nParticleCreationInterval, 0, 5, 1);
 TWEAKFLOAT(fParticleScaleLimit, 0.0f, 1.0f, 0.1f);
 TWEAKFUNC(CParticle::ReloadConfig);
+#endif
 
 void CParticle::ReloadConfig()
 {
diff --git a/src/render/Shadows.cpp b/src/render/Shadows.cpp
index cc8c7034..cefc1d9f 100644
--- a/src/render/Shadows.cpp
+++ b/src/render/Shadows.cpp
@@ -20,8 +20,10 @@
 #include "SpecialFX.h"
 #include "Shadows.h"
 
+#ifdef DEBUGMENU
 SETTWEAKPATH("Shadows");
 TWEAKBOOL(gbPrintShite);
+#endif
 
 RwImVertexIndex ShadowIndexList[24];
 
diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index ed618dd8..cb1d4ab5 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -13,6 +13,7 @@ RtCharset *debugCharset;
 
 bool gPS2alphaTest = 1;
 
+#ifndef FINAL
 static bool charsetOpen;
 void OpenCharsetSafe()
 {
@@ -20,6 +21,7 @@ void OpenCharsetSafe()
 		RtCharsetOpen();
 	charsetOpen = true;
 }
+#endif
 
 void CreateDebugFont()
 {