8 files changed, 22 insertions, 9 deletions

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/World.cpp b/src/core/World.cpp
index 29505481..3e07721a 100644
--- a/src/core/World.cpp
+++ b/src/core/World.cpp
@@ -382,7 +382,11 @@ CWorld::ProcessVerticalLine(const CVector &point1, float z2, CColPoint &point, C
 {
 	AdvanceCurrentScanCode();
 	CVector point2(point1.x, point1.y, z2);
-	return ProcessVerticalLineSector(*GetSector(GetSectorIndexX(point1.x), GetSectorIndexY(point1.y)),
+	int secX = GetSectorIndexX(point1.x);
+	int secY = GetSectorIndexY(point1.y);
+	secX = clamp(secX, 0, NUMSECTORS_X-1);
+	secY = clamp(secY, 0, NUMSECTORS_Y-1);
+	return ProcessVerticalLineSector(*GetSector(secX, secY),
 	                                 CColLine(point1, point2), point, entity, checkBuildings, checkVehicles,
 	                                 checkPeds, checkObjects, checkDummies, ignoreSeeThrough, poly);
 }
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];