9 files changed, 35 insertions, 544 deletions

diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index f15232f3..cb16c3ad 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -209,7 +209,7 @@ WellBufferMe(float Target, float *CurrentValue, float *CurrentSpeed, float MaxSp
 	else if(TargetSpeed > 0.0f && *CurrentSpeed > TargetSpeed)
 		*CurrentSpeed = TargetSpeed;
 
-	*CurrentValue += *CurrentSpeed * Min(10.0f, CTimer::GetTimeStep());
+	*CurrentValue += *CurrentSpeed * min(10.0f, CTimer::GetTimeStep());
 }
 
 void
@@ -697,7 +697,7 @@ CCam::Process_FollowPed(const CVector &CameraTarget, float TargetOrientation, fl
 	// Process height offset to avoid peds and cars
 
 	float TargetZOffSet = m_fUnknownZOffSet + m_fDimensionOfHighestNearCar;
-	TargetZOffSet = Max(TargetZOffSet, m_fPedBetweenCameraHeightOffset);
+	TargetZOffSet = max(TargetZOffSet, m_fPedBetweenCameraHeightOffset);
 	float TargetHeight = CameraTarget.z + TargetZOffSet - Source.z;
 
 	if(TargetHeight > m_fCamBufferedHeight){
@@ -753,7 +753,7 @@ CCam::Process_FollowPed(const CVector &CameraTarget, float TargetOrientation, fl
 		}
 	}
 
-	TargetCoors.z += Min(1.0f, m_fCamBufferedHeight/2.0f);
+	TargetCoors.z += min(1.0f, m_fCamBufferedHeight/2.0f);
 	m_cvecTargetCoorsForFudgeInter = TargetCoors;
 
 	Front = TargetCoors - Source;
@@ -991,7 +991,7 @@ CCam::WorkOutCamHeight(const CVector &TargetCoors, float TargetOrientation, floa
 		}
 		if(FoundCamRoof){
 			// Camera is under something
-			float roof = FoundRoofCenter ? Min(CamRoof, CarRoof) : CamRoof;
+			float roof = FoundRoofCenter ? min(CamRoof, CarRoof) : CamRoof;
 			// Same weirdness again?
 			TargetAlpha = CGeneral::GetATanOfXY(CA_MAX_DISTANCE, roof - CamTargetZ - 1.5f);
 			CamClear = false;
@@ -1249,7 +1249,7 @@ void
 CCam::Cam_On_A_String_Unobscured(const CVector &TargetCoors, float BaseDist)
 {
 	CA_MAX_DISTANCE = BaseDist + 0.1f + TheCamera.CarZoomValueSmooth;
-	CA_MIN_DISTANCE = Min(BaseDist*0.6f, 3.5f);
+	CA_MIN_DISTANCE = min(BaseDist*0.6f, 3.5f);
 
 	CVector Dist = Source - TargetCoors;
 
diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp
index 538bcae6..66b29d9f 100644
--- a/src/core/Collision.cpp
+++ b/src/core/Collision.cpp
@@ -153,10 +153,10 @@ CCollision::LoadCollisionWhenINeedIt(bool forceChange)
 			// on water we expect to be between levels
 			multipleLevels = true;
 		}else{
-			xmin = Max(sx - 1, 0);
-			xmax = Min(sx + 1, NUMSECTORS_X-1);
-			ymin = Max(sy - 1, 0);
-			ymax = Min(sy + 1, NUMSECTORS_Y-1);
+			xmin = max(sx - 1, 0);
+			xmax = min(sx + 1, NUMSECTORS_X-1);
+			ymin = max(sy - 1, 0);
+			ymax = min(sy + 1, NUMSECTORS_Y-1);
 
 			for(x = xmin; x <= xmax; x++)
 				for(y = ymin; y <= ymax; y++){
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index c8a00744..1de5c94f 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -1030,7 +1030,7 @@ int CMenuManager::FadeIn(int alpha)
 		m_nCurrScreen == MENUPAGE_SAVING_IN_PROGRESS ||
 		m_nCurrScreen == MENUPAGE_DELETING)
 		return alpha;
-	return Min(m_nMenuFadeAlpha, alpha);
+	return min(m_nMenuFadeAlpha, alpha);
 }
 #endif
 
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index b5086d64..f334a255 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -299,10 +299,10 @@ CControllerState CPad::ReconcileTwoControllersInput(CControllerState const &Stat
 	{ if ( State1.button || State2.button ) ReconState.button = 255; }
 	
 #define _RECONCILE_AXIS_POSITIVE(axis) \
-	{ if ( State1.axis >= 0 && State2.axis >= 0 ) ReconState.axis = Max(State1.axis, State2.axis); }
+	{ if ( State1.axis >= 0 && State2.axis >= 0 ) ReconState.axis = max(State1.axis, State2.axis); }
 
 #define _RECONCILE_AXIS_NEGATIVE(axis) \
-	{ if ( State1.axis <= 0 && State2.axis <= 0 ) ReconState.axis = Min(State1.axis, State2.axis); }
+	{ if ( State1.axis <= 0 && State2.axis <= 0 ) ReconState.axis = min(State1.axis, State2.axis); }
 
 #define _RECONCILE_AXIS(axis) \
 	{ _RECONCILE_AXIS_POSITIVE(axis); _RECONCILE_AXIS_NEGATIVE(axis); }
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index 8158cd1d..a7bde91e 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -1940,7 +1940,7 @@ CStreaming::ProcessEntitiesInSectorList(CPtrList &list, float x, float y, float
 			CTimeModelInfo *mi = (CTimeModelInfo*)CModelInfo::GetModelInfo(e->GetModelIndex());
 			if(mi->m_type != MITYPE_TIME || CClock::GetIsTimeInRange(mi->GetTimeOn(), mi->GetTimeOff())){
 				lodDistSq = sq(mi->GetLargestLodDistance());
-				lodDistSq = Min(lodDistSq, sq(STREAM_DIST));
+				lodDistSq = min(lodDistSq, sq(STREAM_DIST));
 				pos = CVector2D(e->GetPosition());
 				if(xmin < pos.x && pos.x < xmax &&
 				   ymin < pos.y && pos.y < ymax &&
@@ -2160,20 +2160,20 @@ CStreaming::DeleteRwObjectsBehindCamera(int32 mem)
 	if(Abs(TheCamera.GetForward().x) > Abs(TheCamera.GetForward().y)){
 		// looking west/east
 
-		ymin = Max(iy - 10, 0);
-		ymax = Min(iy + 10, NUMSECTORS_Y);
+		ymin = max(iy - 10, 0);
+		ymax = min(iy + 10, NUMSECTORS_Y);
 		assert(ymin <= ymax);
 
 		// Delete a block of sectors that we know is behind the camera
 		if(TheCamera.GetForward().x > 0){
 			// looking east
-			xmax = Max(ix - 2, 0);
-			xmin = Max(ix - 10, 0);
+			xmax = max(ix - 2, 0);
+			xmin = max(ix - 10, 0);
 			inc = 1;
 		}else{
 			// looking west
-			xmax = Min(ix + 2, NUMSECTORS_X);
-			xmin = Min(ix + 10, NUMSECTORS_X);
+			xmax = min(ix + 2, NUMSECTORS_X);
+			xmin = min(ix + 10, NUMSECTORS_X);
 			inc = -1;
 		}
 		for(y = ymin; y <= ymax; y++){
@@ -2189,13 +2189,13 @@ CStreaming::DeleteRwObjectsBehindCamera(int32 mem)
 		// Now a block that intersects with the camera's frustum
 		if(TheCamera.GetForward().x > 0){
 			// looking east
-			xmax = Max(ix + 10, 0);
-			xmin = Max(ix - 2, 0);
+			xmax = max(ix + 10, 0);
+			xmin = max(ix - 2, 0);
 			inc = 1;
 		}else{
 			// looking west
-			xmax = Min(ix - 10, NUMSECTORS_X);
-			xmin = Min(ix + 2, NUMSECTORS_X);
+			xmax = min(ix - 10, NUMSECTORS_X);
+			xmin = min(ix + 2, NUMSECTORS_X);
 			inc = -1;
 		}
 		for(y = ymin; y <= ymax; y++){
@@ -2224,20 +2224,20 @@ CStreaming::DeleteRwObjectsBehindCamera(int32 mem)
 	}else{
 		// looking north/south
 
-		xmin = Max(ix - 10, 0);
-		xmax = Min(ix + 10, NUMSECTORS_X);
+		xmin = max(ix - 10, 0);
+		xmax = min(ix + 10, NUMSECTORS_X);
 		assert(xmin <= xmax);
 
 		// Delete a block of sectors that we know is behind the camera
 		if(TheCamera.GetForward().y > 0){
 			// looking north
-			ymax = Max(iy - 2, 0);
-			ymin = Max(iy - 10, 0);
+			ymax = max(iy - 2, 0);
+			ymin = max(iy - 10, 0);
 			inc = 1;
 		}else{
 			// looking south
-			ymax = Min(iy + 2, NUMSECTORS_Y);
-			ymin = Min(iy + 10, NUMSECTORS_Y);
+			ymax = min(iy + 2, NUMSECTORS_Y);
+			ymin = min(iy + 10, NUMSECTORS_Y);
 			inc = -1;
 		}
 		for(x = xmin; x <= xmax; x++){
@@ -2253,13 +2253,13 @@ CStreaming::DeleteRwObjectsBehindCamera(int32 mem)
 		// Now a block that intersects with the camera's frustum
 		if(TheCamera.GetForward().y > 0){
 			// looking north
-			ymax = Max(iy + 10, 0);
-			ymin = Max(iy - 2, 0);
+			ymax = max(iy + 10, 0);
+			ymin = max(iy - 2, 0);
 			inc = 1;
 		}else{
 			// looking south
-			ymax = Min(iy - 10, NUMSECTORS_Y);
-			ymin = Min(iy + 2, NUMSECTORS_Y);
+			ymax = min(iy - 10, NUMSECTORS_Y);
+			ymin = min(iy + 2, NUMSECTORS_Y);
 			inc = -1;
 		}
 		for(x = xmin; x <= xmax; x++){
diff --git a/src/core/Wanted.cpp b/src/core/Wanted.cpp
index daed9155..26b115e3 100644
--- a/src/core/Wanted.cpp
+++ b/src/core/Wanted.cpp
@@ -209,7 +209,7 @@ CWanted::ReportCrimeNow(eCrimeType type, const CVector &coors, bool policeDoesnt
 	else
 		sensitivity = m_fCrimeSensitivity;
 
-	wantedLevelDrop = Min(CCullZones::GetWantedLevelDrop(), 100);
+	wantedLevelDrop = min(CCullZones::GetWantedLevelDrop(), 100);
 
 	chaos = (1.0f - wantedLevelDrop/100.0f) * sensitivity;
 	if (policeDoesntCare)
diff --git a/src/core/main.cpp b/src/core/main.cpp
index a82a2ab8..50494ef3 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -453,7 +453,7 @@ DoFade(void)
 		CRGBA fadeColor;
 		CRect rect;
 		int fadeValue = CDraw::FadeValue;
-		float brightness = Min(CMenuManager::m_PrefsBrightness, 256);
+		float brightness = min(CMenuManager::m_PrefsBrightness, 256);
 		if(brightness <= 50)
 			brightness = 50;
 		if(FrontEndMenuManager.m_bMenuActive)
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 0ce5ee3c..ad3838bd 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -374,32 +374,6 @@ delayedPatches10(int a, int b)
 }
 */
 
-<<<<<<< HEAD
-=======
-void __declspec(naked) HeadlightsFix()
-{
-	static const float		fMinusOne = -1.0f;
-	_asm
-	{
-		fld		[esp+708h-690h]
-		fcomp	fMinusOne
-		fnstsw	ax
-		and		ah, 5
-		cmp		ah, 1
-		jnz		HeadlightsFix_DontLimit
-		fld		fMinusOne
-		fstp	[esp+708h-690h]
-
-HeadlightsFix_DontLimit:
-		fld		[esp+708h-690h]
-		fabs
-		fld		st
-		push		0x5382F2
-		retn
-	}
-}
-
->>>>>>> More audio ped
 const int   re3_buffsize = 1024;
 static char re3_buff[re3_buffsize];
 
diff --git a/src/core/re3.cpp.autosave b/src/core/re3.cpp.autosave
deleted file mode 100644
index ad3838bd..00000000
--- a/src/core/re3.cpp.autosave
+++ /dev/null
@@ -1,483 +0,0 @@
-#include <direct.h>
-#include <csignal>
-#include <windows.h>
-#include "common.h"
-#include "patcher.h"
-#include "Renderer.h"
-#include "Credits.h"
-#include "Camera.h"
-#include "Weather.h"
-#include "Clock.h"
-#include "World.h"
-#include "Vehicle.h"
-#include "ModelIndices.h"
-#include "Streaming.h"
-#include "PathFind.h"
-#include "Boat.h"
-#include "Heli.h"
-#include "Automobile.h"
-#include "Ped.h"
-#include "debugmenu_public.h"
-
-#include <vector>
-#include <list>
-
-std::vector<int32> usedAddresses;
-
-void **rwengine = *(void***)0x5A10E1;
-
-DebugMenuAPI gDebugMenuAPI;
-
-WRAPPER void *gtanew(uint32 sz) { EAXJMP(0x5A0690); }
-WRAPPER void gtadelete(void *p) { EAXJMP(0x5A07E0); }
-
-// overload our own new/delete with GTA's functions
-void *operator new(size_t sz) { return gtanew(sz); }
-void operator delete(void *ptr) noexcept { gtadelete(ptr); }
-
-#ifdef USE_PS2_RAND
-unsigned __int64 myrand_seed = 1;
-#else
-unsigned long int myrand_seed = 1;
-#endif
-
-int
-myrand(void)
-{
-#ifdef USE_PS2_RAND
-	// Use our own implementation of rand, stolen from PS2
-	myrand_seed = 0x5851F42D4C957F2D * myrand_seed + 1;
-	return ((myrand_seed >> 32) & 0x7FFFFFFF);
-#else
-	// or original codewarrior rand
-	myrand_seed = myrand_seed * 1103515245 + 12345;
-	return((myrand_seed >> 16) & 0x7FFF);
-#endif
-}
-
-void
-mysrand(unsigned int seed)
-{
-	myrand_seed = seed;
-}
-
-void (*DebugMenuProcess)(void);
-void (*DebugMenuRender)(void);
-static void stub(void) { }
-
-void
-DebugMenuInit(void)
-{
-	if(DebugMenuLoad()){
-		DebugMenuProcess = (void(*)(void))GetProcAddress(gDebugMenuAPI.module, "DebugMenuProcess");
-		DebugMenuRender = (void(*)(void))GetProcAddress(gDebugMenuAPI.module, "DebugMenuRender");
-	}
-	if(DebugMenuProcess == nil || DebugMenuRender == nil){
-		DebugMenuProcess = stub;
-		DebugMenuRender = stub;
-	}
-
-}
-
-void WeaponCheat();
-void HealthCheat();
-void TankCheat();
-void BlowUpCarsCheat();
-void ChangePlayerCheat();
-void MayhemCheat();
-void EverybodyAttacksPlayerCheat();
-void WeaponsForAllCheat();
-void FastTimeCheat();
-void SlowTimeCheat();
-void MoneyCheat();
-void ArmourCheat();
-void WantedLevelUpCheat();
-void WantedLevelDownCheat();
-void SunnyWeatherCheat();
-void CloudyWeatherCheat();
-void RainyWeatherCheat();
-void FoggyWeatherCheat();
-void FastWeatherCheat();
-void OnlyRenderWheelsCheat();
-void ChittyChittyBangBangCheat();
-void StrongGripCheat();
-void NastyLimbsCheat();
-
-DebugMenuEntry *carCol1;
-DebugMenuEntry *carCol2;
-
-void
-SpawnCar(int id)
-{
-	CVector playerpos;
-	CStreaming::RequestModel(id, 0);
-	CStreaming::LoadAllRequestedModels(false);
-	if(CStreaming::HasModelLoaded(id)){
-		playerpos = FindPlayerCoors();
-		int node = ThePaths.FindNodeClosestToCoors(playerpos, 0, 100.0f, false, false);
-		if(node < 0)
-			return;
-
-		CVehicle *v;
-		if(CModelInfo::IsBoatModel(id))
-			return;
-		else
-			v = new CAutomobile(id, RANDOM_VEHICLE);
-
-		v->bHasBeenOwnedByPlayer = true;
-		if(carCol1)
-			DebugMenuEntrySetAddress(carCol1, &v->m_currentColour1);
-		if(carCol2)
-			DebugMenuEntrySetAddress(carCol2, &v->m_currentColour2);
-
-		v->GetPosition() = ThePaths.m_pathNodes[node].pos;
-		v->GetPosition().z += 4.0f;
-		v->SetOrientation(0.0f, 0.0f, 3.49f);
-		v->m_status = STATUS_ABANDONED;
-		v->m_nDoorLock = CARLOCK_UNLOCKED;
-		CWorld::Add(v);
-	}
-}
-
-static void
-LetThemFollowYou(void) {
-	CPed* player = (CPed*) FindPlayerPed();
-	for (int i = 0; i < player->m_numNearPeds; i++) {
-
-		CPed* nearPed = player->m_nearPeds[i];
-		if (nearPed && !nearPed->IsPlayer()) {
-			nearPed->SetObjective(OBJECTIVE_FOLLOW_PED_IN_FORMATION, (void*)player);
-			nearPed->m_pedFormation = rand() & 7;
-			nearPed->bScriptObjectiveCompleted = false;
-		}
-	}
-}
-
-static void
-FixCar(void)
-{
-	CVehicle *veh = FindPlayerVehicle();
-	if(veh == nil)
-		return;
-	veh->m_fHealth = 1000.0f;
-	if(!veh->IsCar())
-		return;
-	((CAutomobile*)veh)->Damage.SetEngineStatus(0);
-	((CAutomobile*)veh)->Fix();
-}
-
-static int engineStatus;
-static void
-SetEngineStatus(void)
-{
-	CVehicle *veh = FindPlayerVehicle();
-	if(veh == nil)
-		return;
-	if(!veh->IsCar())
-		return;
-	((CAutomobile*)veh)->Damage.SetEngineStatus(engineStatus);
-}
-
-static void
-ToggleComedy(void)
-{
-	CVehicle *veh = FindPlayerVehicle();
-	if(veh == nil)
-		return;
-	veh->bComedyControls = !veh->bComedyControls;
-}
-
-static void
-PlaceOnRoad(void)
-{
-	CVehicle *veh = FindPlayerVehicle();
-	if(veh == nil)
-		return;
-
-	if(veh->IsCar())
-		((CAutomobile*)veh)->PlaceOnRoadProperly();
-}
-
-static const char *carnames[] = {
-	"landstal", "idaho", "stinger", "linerun", "peren", "sentinel", "patriot", "firetruk", "trash", "stretch", "manana", "infernus", "blista", "pony",
-	"mule", "cheetah", "ambulan", "fbicar", "moonbeam", "esperant", "taxi", "kuruma", "bobcat", "mrwhoop", "bfinject", "corpse", "police", "enforcer",
-	"securica", "banshee", "predator", "bus", "rhino", "barracks", "train", "chopper", "dodo", "coach", "cabbie", "stallion", "rumpo", "rcbandit",
-	"bellyup", "mrwongs", "mafia", "yardie", "yakuza", "diablos", "columb", "hoods", "airtrain", "deaddodo", "speeder", "reefer", "panlant", "flatbed",
-	"yankee", "escape", "borgnine", "toyz", "ghost",
-};
-
-static std::list<CTweakVar *> TweakVarsList;
-static bool bAddTweakVarsNow = false;
-static const char *pTweakVarsDefaultPath = NULL;
-
-void CTweakVars::Add(CTweakVar *var)
-{
-	TweakVarsList.push_back(var);
-	
-	if ( bAddTweakVarsNow )
-		var->AddDBG(pTweakVarsDefaultPath);
-}
-
-void CTweakVars::AddDBG(const char *path)
-{
-	pTweakVarsDefaultPath = path;
-
-	for(auto i = TweakVarsList.begin(); i != TweakVarsList.end(); ++i)
-		(*i)->AddDBG(pTweakVarsDefaultPath);
-	
-	bAddTweakVarsNow = true;
-}
-
-void CTweakSwitch::AddDBG(const char *path)
-{		
-	DebugMenuEntry *e = DebugMenuAddVar(m_pPath == NULL ? path : m_pPath, m_pVarName, (int32_t *)m_pIntVar, m_pFunc, 1, m_nMin, m_nMax, m_aStr);
-	DebugMenuEntrySetWrap(e, true);
-}
-	
-void CTweakFunc::AddDBG  (const char *path) { DebugMenuAddCmd     (m_pPath == NULL ? path : m_pPath, m_pVarName, m_pFunc); }
-void CTweakBool::AddDBG  (const char *path) { DebugMenuAddVarBool8(m_pPath == NULL ? path : m_pPath, m_pVarName, (int8_t *)m_pBoolVar,  NULL); }
-void CTweakInt8::AddDBG  (const char *path) { DebugMenuAddVar     (m_pPath == NULL ? path : m_pPath, m_pVarName, (int8_t *)m_pIntVar,   NULL, m_nStep, m_nLoawerBound, m_nUpperBound, NULL); }
-void CTweakUInt8::AddDBG (const char *path) { DebugMenuAddVar     (m_pPath == NULL ? path : m_pPath, m_pVarName, (uint8_t *)m_pIntVar,  NULL, m_nStep, m_nLoawerBound, m_nUpperBound, NULL); }
-void CTweakInt16::AddDBG (const char *path) { DebugMenuAddVar     (m_pPath == NULL ? path : m_pPath, m_pVarName, (int16_t *)m_pIntVar,  NULL, m_nStep, m_nLoawerBound, m_nUpperBound, NULL); }
-void CTweakUInt16::AddDBG(const char *path) { DebugMenuAddVar     (m_pPath == NULL ? path : m_pPath, m_pVarName, (uint16_t *)m_pIntVar, NULL, m_nStep, m_nLoawerBound, m_nUpperBound, NULL); }
-void CTweakInt32::AddDBG (const char *path) { DebugMenuAddVar     (m_pPath == NULL ? path : m_pPath, m_pVarName, (int32_t *)m_pIntVar,  NULL, m_nStep, m_nLoawerBound, m_nUpperBound, NULL); }
-void CTweakUInt32::AddDBG(const char *path) { DebugMenuAddVar     (m_pPath == NULL ? path : m_pPath, m_pVarName, (uint32_t *)m_pIntVar, NULL, m_nStep, m_nLoawerBound, m_nUpperBound, NULL); }
-void CTweakFloat::AddDBG (const char *path) { DebugMenuAddVar     (m_pPath == NULL ? path : m_pPath, m_pVarName, (float *)m_pIntVar,    NULL, m_nStep, m_nLoawerBound, m_nUpperBound); }
-
-/*
-static const char *wt[] = {
-			"Sunny", "Cloudy", "Rainy", "Foggy"
-		};
-
-SETTWEAKPATH("TEST");		
-TWEAKSWITCH(CWeather::NewWeatherType, 0, 3, wt, NULL);
-*/
-
-void
-DebugMenuPopulate(void)
-{
-	if(DebugMenuLoad()){
-		static const char *weathers[] = {
-			"Sunny", "Cloudy", "Rainy", "Foggy"
-		};
-		DebugMenuEntry *e;
-		e = DebugMenuAddVar("Time & Weather", "Current Hour", &CClock::GetHoursRef(), nil, 1, 0, 23, nil);
-		DebugMenuEntrySetWrap(e, true);
-		e = DebugMenuAddVar("Time & Weather", "Current Minute", &CClock::GetMinutesRef(),
-			[](){ CWeather::InterpolationValue = CClock::GetMinutes()/60.0f; }, 1, 0, 59, nil);
-			DebugMenuEntrySetWrap(e, true);
-		e = DebugMenuAddVar("Time & Weather", "Old Weather", (int16*)&CWeather::OldWeatherType, nil, 1, 0, 3, weathers);
-		DebugMenuEntrySetWrap(e, true);
-		e = DebugMenuAddVar("Time & Weather", "New Weather", (int16*)&CWeather::NewWeatherType, nil, 1, 0, 3, weathers);
-		DebugMenuEntrySetWrap(e, true);
-		DebugMenuAddVar("Time & Weather", "Wind", (float*)&CWeather::Wind, nil, 0.1f, 0.0f, 1.0f);
-		DebugMenuAddVar("Time & Weather", "Time scale", (float*)0x8F2C20, nil, 0.1f, 0.0f, 10.0f);
-
-		DebugMenuAddCmd("Cheats", "Weapons", WeaponCheat);
-		DebugMenuAddCmd("Cheats", "Money", MoneyCheat);
-		DebugMenuAddCmd("Cheats", "Health", HealthCheat);
-		DebugMenuAddCmd("Cheats", "Wanted level up", WantedLevelUpCheat);
-		DebugMenuAddCmd("Cheats", "Wanted level down", WantedLevelDownCheat);
-		DebugMenuAddCmd("Cheats", "Tank", TankCheat);
-		DebugMenuAddCmd("Cheats", "Blow up cars", BlowUpCarsCheat);
-		DebugMenuAddCmd("Cheats", "Change player", ChangePlayerCheat);
-		DebugMenuAddCmd("Cheats", "Mayhem", MayhemCheat);
-		DebugMenuAddCmd("Cheats", "Everybody attacks player", EverybodyAttacksPlayerCheat);
-		DebugMenuAddCmd("Cheats", "Weapons for all", WeaponsForAllCheat);
-		DebugMenuAddCmd("Cheats", "Fast time", FastTimeCheat);
-		DebugMenuAddCmd("Cheats", "Slow time", SlowTimeCheat);
-		DebugMenuAddCmd("Cheats", "Armour", ArmourCheat);
-		DebugMenuAddCmd("Cheats", "Sunny weather", SunnyWeatherCheat);
-		DebugMenuAddCmd("Cheats", "Cloudy weather", CloudyWeatherCheat);
-		DebugMenuAddCmd("Cheats", "Rainy weather", RainyWeatherCheat);
-		DebugMenuAddCmd("Cheats", "Foggy weather", FoggyWeatherCheat);
-		DebugMenuAddCmd("Cheats", "Fast weather", FastWeatherCheat);
-		DebugMenuAddCmd("Cheats", "Only render wheels", OnlyRenderWheelsCheat);
-		DebugMenuAddCmd("Cheats", "Chitty chitty bang bang", ChittyChittyBangBangCheat);
-		DebugMenuAddCmd("Cheats", "Strong grip", StrongGripCheat);
-		DebugMenuAddCmd("Cheats", "Nasty limbs", NastyLimbsCheat);
-
-		static int spawnCarId = MI_LANDSTAL;
-		e = DebugMenuAddVar("Spawn", "Spawn Car ID", &spawnCarId, nil, 1, MI_LANDSTAL, MI_GHOST, carnames);
-		DebugMenuEntrySetWrap(e, true);
-		DebugMenuAddCmd("Spawn", "Spawn Car", [](){
-			if(spawnCarId == MI_TRAIN ||
-			   spawnCarId == MI_CHOPPER ||
-			   spawnCarId == MI_AIRTRAIN ||
-			   spawnCarId == MI_DEADDODO ||
-			   spawnCarId == MI_ESCAPE)
-				return;
-			SpawnCar(spawnCarId);
-		});
-		static uint8 dummy;
-		carCol1 = DebugMenuAddVar("Spawn", "First colour", &dummy, nil, 1, 0, 255, nil);
-		carCol2 = DebugMenuAddVar("Spawn", "Second colour", &dummy, nil, 1, 0, 255, nil);
-		DebugMenuAddCmd("Spawn", "Spawn Stinger", [](){ SpawnCar(MI_STINGER); });
-		DebugMenuAddCmd("Spawn", "Spawn Infernus", [](){ SpawnCar(MI_INFERNUS); });
-		DebugMenuAddCmd("Spawn", "Spawn Cheetah", [](){ SpawnCar(MI_CHEETAH); });
-		DebugMenuAddCmd("Spawn", "Spawn Esperanto", [](){ SpawnCar(MI_ESPERANT); });
-		DebugMenuAddCmd("Spawn", "Spawn Stallion", [](){ SpawnCar(MI_STALLION); });
-		DebugMenuAddCmd("Spawn", "Spawn Kuruma", [](){ SpawnCar(MI_KURUMA); });
-		DebugMenuAddCmd("Spawn", "Spawn Taxi", [](){ SpawnCar(MI_TAXI); });
-		DebugMenuAddCmd("Spawn", "Spawn Police", [](){ SpawnCar(MI_POLICE); });
-		DebugMenuAddCmd("Spawn", "Spawn Enforcer", [](){ SpawnCar(MI_ENFORCER); });
-		DebugMenuAddCmd("Spawn", "Spawn Banshee", [](){ SpawnCar(MI_BANSHEE); });
-		DebugMenuAddCmd("Spawn", "Spawn Yakuza", [](){ SpawnCar(MI_YAKUZA); });
-		DebugMenuAddCmd("Spawn", "Spawn Yardie", [](){ SpawnCar(MI_YARDIE); });
-		DebugMenuAddCmd("Spawn", "Spawn Dodo", [](){ SpawnCar(MI_DODO); });
-		DebugMenuAddCmd("Spawn", "Spawn Rhino", [](){ SpawnCar(MI_RHINO); });
-		DebugMenuAddCmd("Spawn", "Spawn Firetruck", [](){ SpawnCar(MI_FIRETRUCK); });
-
-		DebugMenuAddVar("Debug", "Engine Status", &engineStatus, nil, 1, 0, 226, nil);
-		DebugMenuAddCmd("Debug", "Set Engine Status", SetEngineStatus);
-		DebugMenuAddCmd("Debug", "Fix Car", FixCar);
-		DebugMenuAddCmd("Debug", "Toggle Comedy Controls", ToggleComedy);
-		DebugMenuAddCmd("Debug", "Place Car on Road", PlaceOnRoad);
-
-		DebugMenuAddVarBool8("Debug", "Catalina Heli On", (int8*)&CHeli::CatalinaHeliOn, nil);
-		DebugMenuAddCmd("Debug", "Catalina Fly By", CHeli::StartCatalinaFlyBy);
-		DebugMenuAddCmd("Debug", "Catalina Take Off", CHeli::CatalinaTakeOff);
-		DebugMenuAddCmd("Debug", "Catalina Fly Away", CHeli::MakeCatalinaHeliFlyAway);
-		DebugMenuAddVarBool8("Debug", "Script Heli On", (int8*)0x95CD43, nil);
-
-		DebugMenuAddVarBool8("Debug", "Show Ped Road Groups", (int8*)&gbShowPedRoadGroups, nil);
-		DebugMenuAddVarBool8("Debug", "Show Car Road Groups", (int8*)&gbShowCarRoadGroups, nil);
-		DebugMenuAddVarBool8("Debug", "Show Collision Lines", (int8*)&gbShowCollisionLines, nil);
-		DebugMenuAddVarBool8("Debug", "Show Collision Polys", (int8*)&gbShowCollisionPolys, nil);
-		DebugMenuAddVarBool8("Debug", "Don't render Buildings", (int8*)&gbDontRenderBuildings, nil);
-		DebugMenuAddVarBool8("Debug", "Don't render Big Buildings", (int8*)&gbDontRenderBigBuildings, nil);
-		DebugMenuAddVarBool8("Debug", "Don't render Peds", (int8*)&gbDontRenderPeds, nil);
-		DebugMenuAddVarBool8("Debug", "Don't render Vehicles", (int8*)&gbDontRenderVehicles, nil);
-		DebugMenuAddVarBool8("Debug", "Don't render Objects", (int8*)&gbDontRenderObjects, nil);
-
-		DebugMenuAddCmd("Debug", "Make peds around you follow you", LetThemFollowYou);
-#ifndef MASTER
-		DebugMenuAddVarBool8("Debug", "Toggle unused fight feature", (int8*)&CPed::bUnusedFightThingOnPlayer, nil);
-#endif
-
-		DebugMenuAddCmd("Debug", "Start Credits", CCredits::Start);
-		DebugMenuAddCmd("Debug", "Stop Credits", CCredits::Stop);
-		
-		CTweakVars::AddDBG("Debug");
-	}
-}
-
-/*
-int (*RsEventHandler_orig)(int a, int b);
-int
-delayedPatches10(int a, int b)
-{
-	DebugMenuInit();
-	DebugMenuPopulate();
-
-	return RsEventHandler_orig(a, b);
-}
-*/
-
-const int   re3_buffsize = 1024;
-static char re3_buff[re3_buffsize];
-
-void re3_assert(const char *expr, const char *filename, unsigned int lineno, const char *func)
-{
-	int nCode;
-
-	strcpy_s(re3_buff, re3_buffsize, "Assertion failed!" );
-	strcat_s(re3_buff, re3_buffsize, "\n" );	
-	
-	strcat_s(re3_buff, re3_buffsize, "File: ");
-	strcat_s(re3_buff, re3_buffsize, filename );
-	strcat_s(re3_buff, re3_buffsize, "\n" );	
-
-	strcat_s(re3_buff, re3_buffsize, "Line: " );
-	_itoa_s( lineno, re3_buff + strlen(re3_buff), re3_buffsize - strlen(re3_buff), 10 );
-	strcat_s(re3_buff, re3_buffsize, "\n");
-	
-	strcat_s(re3_buff, re3_buffsize, "Function: ");
-	strcat_s(re3_buff, re3_buffsize, func );
-	strcat_s(re3_buff, re3_buffsize, "\n" );	
-	
-	strcat_s(re3_buff, re3_buffsize, "Expression: ");
-	strcat_s(re3_buff, re3_buffsize, expr);
-	strcat_s(re3_buff, re3_buffsize, "\n");
-
-	strcat_s(re3_buff, re3_buffsize, "\n" );
-	strcat_s(re3_buff, re3_buffsize, "(Press Retry to debug the application)");
-
-
-	nCode = ::MessageBoxA(nil, re3_buff, "RE3 Assertion Failed!",
-		MB_ABORTRETRYIGNORE|MB_ICONHAND|MB_SETFOREGROUND|MB_TASKMODAL);
-
-	if (nCode == IDABORT)
-	{
-		raise(SIGABRT);
-		_exit(3);
-	}
-
-	if (nCode == IDRETRY)
-	{
-		__debugbreak();
-		return;
-	}
-
-	if (nCode == IDIGNORE)
-		return;
-
-	abort();
-}
-
-void re3_debug(char *format, ...)
-{
-	va_list va;
-	va_start(va, format);
-	vsprintf_s(re3_buff, re3_buffsize, format, va);
-	va_end(va);
-
-	printf("%s", re3_buff);
-}
-
-void re3_trace(const char *filename, unsigned int lineno, const char *func, char *format, ...)
-{
-	char buff[re3_buffsize *2];
-	va_list va;
-	va_start(va, format);
-	vsprintf_s(re3_buff, re3_buffsize, format, va);
-	va_end(va);
-	
-	sprintf_s(buff, re3_buffsize * 2, "[%s.%s:%d]: %s", filename, func, lineno, re3_buff);
-	
-	OutputDebugStringA(buff);
-}
-
-void
-patch()
-{
-	StaticPatcher::Apply();
-
-//	Patch<float>(0x46BC61+6, 1.0f);	// car distance
-	InjectHook(0x59E460, printf, PATCH_JUMP);
-	InjectHook(0x475E00, printf, PATCH_JUMP);	// _Error
-
-
-//	InterceptCall(&open_script_orig, open_script, 0x438869);
-
-//	InterceptCall(&RsEventHandler_orig, delayedPatches10, 0x58275E);
-}
-
-BOOL WINAPI
-DllMain(HINSTANCE hInst, DWORD reason, LPVOID)
-{
-	if(reason == DLL_PROCESS_ATTACH){
-
-		AllocConsole();
-		freopen("CONIN$", "r", stdin);
-		freopen("CONOUT$", "w", stdout);
-		freopen("CONOUT$", "w", stderr);
-
-		if (*(DWORD*)0x5C1E75 == 0xB85548EC)	// 1.0
-			patch();
-		else
-			return FALSE;
-	}
-
-	return TRUE;
-}