9 files changed, 139 insertions, 80 deletions

diff --git a/src/core/FileLoader.cpp b/src/core/FileLoader.cpp
index 9aaba611..f711407a 100644
--- a/src/core/FileLoader.cpp
+++ b/src/core/FileLoader.cpp
@@ -846,14 +846,15 @@ CFileLoader::LoadVehicleObject(const char *line)
 	char type[8], handlingId[16], gamename[32], animFile[16], vehclass[12];
 	uint32 frequency, comprules;
 	int32 level, misc;
-	float wheelScale;
+	float wheelScale, normalSplay;
 	CVehicleModelInfo *mi;
 	char *p;
 
-	sscanf(line, "%d %s %s %s %s %s %s %s %d %d %x %d %f",
+	sscanf(line, "%d %s %s %s %s %s %s %s %d %d %x %d %f %f",
 		&id, model, txd,
 		type, handlingId, gamename, animFile, vehclass,
-		&frequency, &level, &comprules, &misc, &wheelScale);
+		&frequency, &level, &comprules, &misc, &wheelScale,
+		&normalSplay);
 
 	mi = CModelInfo::AddVehicleModel(id);
 	mi->SetName(model);
@@ -873,6 +874,8 @@ CFileLoader::LoadVehicleObject(const char *line)
 		mi->m_vehicleType = VEHICLE_TYPE_BOAT;
 	}else if(strcmp(type, "train") == 0){
 		mi->m_vehicleType = VEHICLE_TYPE_TRAIN;
+	}else if(strcmp(type, "ferry") == 0){
+		mi->m_vehicleType = VEHICLE_TYPE_FERRY;
 	}else if(strcmp(type, "heli") == 0){
 		mi->m_vehicleType = VEHICLE_TYPE_HELI;
 	}else if(strcmp(type, "plane") == 0){
diff --git a/src/core/Game.cpp b/src/core/Game.cpp
index 8405c2ec..79698dde 100644
--- a/src/core/Game.cpp
+++ b/src/core/Game.cpp
@@ -375,7 +375,7 @@ bool CGame::Initialise(const char* datFile)
 #ifdef USE_TEXTURE_POOL
 	_TexturePoolsUnknown(false);
 #endif
-	currLevel = LEVEL_BEACH;
+	currLevel = LEVEL_INDUSTRIAL;
 	currArea = AREA_MAIN_MAP;
 
 	PUSH_MEMID(MEMID_TEXTURES);
@@ -441,7 +441,7 @@ bool CGame::Initialise(const char* datFile)
 
 	CdStreamAddImage("MODELS\\GTA3.IMG");
 
-	CFileLoader::LoadLevel("DATA\\DEFAULT.DAT");
+//	CFileLoader::LoadLevel("DATA\\DEFAULT.DAT");
 	CFileLoader::LoadLevel(datFile);
 #ifdef EXTENDED_PIPELINES
 	// for generic fallback
@@ -661,8 +661,9 @@ void CGame::ReInitGameObjectVariables(void)
 	CDraw::SetFOV(120.0f);
 	CDraw::ms_fLODDistance = 500.0f;
 	CStreaming::RequestBigBuildings(LEVEL_GENERIC);
-	CStreaming::RemoveIslandsNotUsed(LEVEL_BEACH);
-	CStreaming::RemoveIslandsNotUsed(LEVEL_MAINLAND);
+	CStreaming::RemoveIslandsNotUsed(LEVEL_INDUSTRIAL);
+	CStreaming::RemoveIslandsNotUsed(LEVEL_COMMERCIAL);
+	CStreaming::RemoveIslandsNotUsed(LEVEL_SUBURBAN);
 	CStreaming::LoadAllRequestedModels(false);
 	currArea = AREA_MAIN_MAP;
 	CPed::Initialise();
diff --git a/src/core/Game.h b/src/core/Game.h
index 4052eb00..fe3268be 100644
--- a/src/core/Game.h
+++ b/src/core/Game.h
@@ -3,10 +3,11 @@
 enum eLevelName {
 	LEVEL_IGNORE = -1, // beware, this is only used in CPhysical's m_nZoneLevel
 	LEVEL_GENERIC = 0,
-	LEVEL_BEACH,
-	LEVEL_MAINLAND,
+	LEVEL_INDUSTRIAL,
+	LEVEL_COMMERCIAL,
+	LEVEL_SUBURBAN,
 
-	NUM_LEVELS
+	NUM_LEVELS	// LCS: should be 5 eventually...
 };
 
 enum eAreaName {
diff --git a/src/core/Pad.cpp b/src/core/Pad.cpp
index feda19c6..1e4f48f4 100644
--- a/src/core/Pad.cpp
+++ b/src/core/Pad.cpp
@@ -97,6 +97,7 @@ extern bool gbFastTime;
 extern bool gGravityCheat;
 #endif
 
+/* LCS: removed
 void SpecialCarCheats()
 {
 	if ( !CVehicle::bCheat9 )
@@ -145,6 +146,7 @@ void SpecialCarCheats()
 		CPad::bHasPlayerCheated = true;
 	}
 }
+*/
 
 void PickUpChicksCheat()
 {
@@ -370,7 +372,7 @@ void ChangePlayerCheat()
 		do
 		{
 			do {
-				modelId = CGeneral::GetRandomNumberInRange(0, MI_PGA);
+				modelId = CGeneral::GetRandomNumberInRange(0, MI_GANG18);
 				anotherModelId = modelId+1;
 			} while (!CModelInfo::GetModelInfo(anotherModelId));
 		} while (anotherModelId >= MI_SPECIAL01 && anotherModelId <= MI_SPECIAL04 || modelId == MI_TAXI_D);
@@ -589,16 +591,18 @@ void SuicideCheat(void) {
 }
 
 void DoChicksWithGunsCheat(void) {
+/*	// broken in LCS
 	CHud::SetHelpMessage(TheText.Get("CHEAT1"), true);
 	CStreaming::SetModelIsDeletable(CGangs::GetGangPedModel1(GANG_PLAYER));
 	CStreaming::SetModelIsDeletable(CGangs::GetGangPedModel2(GANG_PLAYER));
 	CStreaming::SetModelTxdIsDeletable(CGangs::GetGangPedModel1(GANG_PLAYER));
 	CStreaming::SetModelTxdIsDeletable(CGangs::GetGangPedModel2(GANG_PLAYER));
 	CStreaming::RemoveCurrentZonesModels();
-	CGangs::SetGangPedModels(GANG_PLAYER, MI_HFYBE, MI_WFYBE);
+	CGangs::SetGangPedModels(GANG_PLAYER, MI_CAS_WOM, MI_HOS_WOM);
 	CGangs::SetGangWeapons(GANG_PLAYER, WEAPONTYPE_M4, WEAPONTYPE_M4);
 	CStats::CheatedCount += 1000;
 	CPad::bHasPlayerCheated = true;
+*/
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1420,6 +1424,8 @@ void CPad::AddToPCCheatString(char c)
 		KeyBoardCheatString[0] = ' ';
 		BlackCarsCheat();
 	}
+/*
+	// LCS: removed for now
 	// "TRAVELINSTYLE"
 	else if (!Cheat_strncmp(KeyBoardCheatString, "HQ`U`iLSFaNZ[")) {
 		KeyBoardCheatString[0] = ' ';
@@ -1515,6 +1521,7 @@ void CPad::AddToPCCheatString(char c)
 		KeyBoardCheatString[0] = ' ';
 		ChangePlayerModel("igdiaz");
 	}
+*/
 	// DEEPFRIEDMARSBARS
 	else if (!Cheat_strncmp(KeyBoardCheatString, "VWHC`mDTEPVZMpRK")) {
 		KeyBoardCheatString[0] = ' ';
@@ -1530,11 +1537,13 @@ void CPad::AddToPCCheatString(char c)
 		KeyBoardCheatString[0] = ' ';
 		BackToTheFuture();
 	}
+/*	LCS: removed
 	// LOADSOFLITTLETHINGS
 	else if (!Cheat_strncmp(KeyBoardCheatString, "VLUJUoHSU_VTMo`J]bV")) {
 		KeyBoardCheatString[0] = ' ';
 		SpecialCarCheats();
 	}
+*/
 	// HOPINGIRL
 	else if (!Cheat_strncmp(KeyBoardCheatString, "OWPH[dSVI")) {
 		KeyBoardCheatString[0] = ' ';
diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp
index 3e470fde..81931b40 100644
--- a/src/core/Streaming.cpp
+++ b/src/core/Streaming.cpp
@@ -78,10 +78,16 @@ size_t CStreaming::ms_memoryAvailable;
 
 int32 desiredNumVehiclesLoaded = 12;
 
-CEntity *pIslandLODmainlandEntity;
-CEntity *pIslandLODbeachEntity;
-int32 islandLODmainland;
-int32 islandLODbeach;
+CEntity *pIslandLODindustEntity;
+CEntity *pIslandLODcomIndEntity;
+CEntity *pIslandLODcomSubEntity;
+CEntity *pIslandLODsubIndEntity;
+CEntity *pIslandLODsubComEntity;
+int32 islandLODindust;
+int32 islandLODcomInd;
+int32 islandLODcomSub;
+int32 islandLODsubInd;
+int32 islandLODsubCom;
 
 #ifndef MASTER
 bool gbPrintStats;
@@ -240,12 +246,21 @@ CStreaming::Init2(void)
 
 	// find island LODs
 
-	pIslandLODmainlandEntity = nil;
-	pIslandLODbeachEntity = nil;
-	islandLODmainland = -1;
-	islandLODbeach = -1;
-	CModelInfo::GetModelInfo("IslandLODmainland", &islandLODmainland);
-	CModelInfo::GetModelInfo("IslandLODbeach", &islandLODbeach);
+	pIslandLODindustEntity = nil;
+	pIslandLODcomIndEntity = nil;
+	pIslandLODcomSubEntity = nil;
+	pIslandLODsubIndEntity = nil;
+	pIslandLODsubComEntity = nil;
+	islandLODindust = -1;
+	islandLODcomInd = -1;
+	islandLODcomSub = -1;
+	islandLODsubInd = -1;
+	islandLODsubCom = -1;
+        CModelInfo::GetModelInfo("IslandLODInd", &islandLODindust);
+        CModelInfo::GetModelInfo("IslandLODcomIND", &islandLODcomInd);
+        CModelInfo::GetModelInfo("IslandLODcomSUB", &islandLODcomSub);
+        CModelInfo::GetModelInfo("IslandLODsubIND", &islandLODsubInd);
+        CModelInfo::GetModelInfo("IslandLODsubCOM", &islandLODsubCom);
 
 #ifndef MASTER
 	VarConsole.Add("Streaming Debug", &gbPrintStats, true);
@@ -912,13 +927,17 @@ CStreaming::RequestIslands(eLevelName level)
 {
 	ISLAND_LOADING_ISNT(HIGH)
 	switch(level){
-	case LEVEL_MAINLAND:
-		if(islandLODbeach != -1)
-			RequestModel(islandLODbeach, BIGBUILDINGFLAGS);
+	case LEVEL_INDUSTRIAL:
+		RequestModel(islandLODcomInd, BIGBUILDINGFLAGS);
+		RequestModel(islandLODsubInd, BIGBUILDINGFLAGS);
 		break;
-	case LEVEL_BEACH:
-		if(islandLODmainland != -1)
-			RequestModel(islandLODmainland, BIGBUILDINGFLAGS);
+	case LEVEL_COMMERCIAL:
+		RequestModel(islandLODindust, BIGBUILDINGFLAGS);
+		RequestModel(islandLODsubCom, BIGBUILDINGFLAGS);
+		break;
+	case LEVEL_SUBURBAN:
+		RequestModel(islandLODindust, BIGBUILDINGFLAGS);
+		RequestModel(islandLODcomSub, BIGBUILDINGFLAGS);
 		break;
 	default: break;
 	}
@@ -1127,10 +1146,12 @@ CStreaming::RemoveModel(int32 id)
 void
 CStreaming::RemoveUnusedBuildings(eLevelName level)
 {
-	if(level != LEVEL_BEACH)
-		RemoveBuildings(LEVEL_BEACH);
-	if(level != LEVEL_MAINLAND)
-		RemoveBuildings(LEVEL_MAINLAND);
+	if(level != LEVEL_INDUSTRIAL)
+		RemoveBuildings(LEVEL_INDUSTRIAL);
+	if(level != LEVEL_COMMERCIAL)
+		RemoveBuildings(LEVEL_COMMERCIAL);
+	if(level != LEVEL_SUBURBAN)
+		RemoveBuildings(LEVEL_SUBURBAN);
 }
 
 void
@@ -1253,10 +1274,12 @@ CStreaming::RemoveUnusedBigBuildings(eLevelName level)
 {
 	ISLAND_LOADING_IS(LOW)
 	{
-	if(level != LEVEL_BEACH)
-		RemoveBigBuildings(LEVEL_BEACH);
-	if(level != LEVEL_MAINLAND)
-		RemoveBigBuildings(LEVEL_MAINLAND);
+	if(level != LEVEL_INDUSTRIAL)
+		RemoveBigBuildings(LEVEL_INDUSTRIAL);
+	if(level != LEVEL_COMMERCIAL)
+		RemoveBigBuildings(LEVEL_COMMERCIAL);
+	if(level != LEVEL_SUBURBAN)
+		RemoveBigBuildings(LEVEL_SUBURBAN);
 	}
 	RemoveIslandsNotUsed(level);
 }
@@ -1278,15 +1301,21 @@ void
 CStreaming::RemoveIslandsNotUsed(eLevelName level)
 {
 	int i;
-	if(pIslandLODmainlandEntity == nil)
+	if(pIslandLODindustEntity == nil)
 	for(i = CPools::GetBuildingPool()->GetSize()-1; i >= 0; i--){
 		CBuilding *building = CPools::GetBuildingPool()->GetSlot(i);
 		if(building == nil)
 			continue;
-		if(building->GetModelIndex() == islandLODmainland)
-			pIslandLODmainlandEntity = building;
-		if(building->GetModelIndex() == islandLODbeach)
-			pIslandLODbeachEntity = building;
+		if(building->GetModelIndex() == islandLODindust)
+			pIslandLODindustEntity = building;
+		else if(building->GetModelIndex() == islandLODcomInd)
+			pIslandLODcomIndEntity = building;
+		else if(building->GetModelIndex() == islandLODcomSub)
+			pIslandLODcomSubEntity = building;
+		else if(building->GetModelIndex() == islandLODsubInd)
+			pIslandLODsubIndEntity = building;
+		else if(building->GetModelIndex() == islandLODsubCom)
+			pIslandLODsubComEntity = building;
 	}
 #ifdef NO_ISLAND_LOADING
 	if(FrontEndMenuManager.m_PrefsIslandLoading == CMenuManager::ISLAND_LOADING_HIGH) {
@@ -1295,12 +1324,27 @@ CStreaming::RemoveIslandsNotUsed(eLevelName level)
 	} else
 #endif
 	switch(level){
-	case LEVEL_MAINLAND:
-		DeleteIsland(pIslandLODmainlandEntity);
+	case LEVEL_INDUSTRIAL:
+		DeleteIsland(pIslandLODindustEntity);
+		DeleteIsland(pIslandLODcomSubEntity);
+		DeleteIsland(pIslandLODsubComEntity);
 		break;
-	case LEVEL_BEACH:
-		DeleteIsland(pIslandLODbeachEntity);
-
+	case LEVEL_COMMERCIAL:
+		DeleteIsland(pIslandLODcomIndEntity);
+		DeleteIsland(pIslandLODcomSubEntity);
+		DeleteIsland(pIslandLODsubIndEntity);
+		break;
+	case LEVEL_SUBURBAN:
+		DeleteIsland(pIslandLODsubIndEntity);
+		DeleteIsland(pIslandLODsubComEntity);
+		DeleteIsland(pIslandLODcomIndEntity);
+		break;
+	default:
+		DeleteIsland(pIslandLODindustEntity);
+		DeleteIsland(pIslandLODcomIndEntity);
+		DeleteIsland(pIslandLODcomSubEntity);
+		DeleteIsland(pIslandLODsubIndEntity);
+		DeleteIsland(pIslandLODsubComEntity);
 		break;
 	}
 }
@@ -1562,6 +1606,7 @@ CStreaming::IsObjectInCdImage(int32 id)
 void
 CStreaming::SetModelIsDeletable(int32 id)
 {
+	assert(id >= 0);	// guard against fake IDs
 	ms_aInfoForModel[id].m_flags &= ~STREAMFLAGS_DONT_REMOVE;
 	if ((id >= STREAM_OFFSET_TXD && id < STREAM_OFFSET_COL || CModelInfo::GetModelInfo(id)->GetModelType() != MITYPE_VEHICLE) &&
 	   (ms_aInfoForModel[id].m_flags & STREAMFLAGS_SCRIPTOWNED) == 0){
@@ -1640,11 +1685,11 @@ CStreaming::StreamVehiclesAndPeds(void)
 	}
 
 	if(FindPlayerPed()->m_pWanted->AreFbiRequired()){
-		RequestModel(MI_FBIRANCH, STREAMFLAGS_DONT_REMOVE);
+		RequestModel(MI_FBICAR, STREAMFLAGS_DONT_REMOVE);
 		RequestModel(MI_FBI, STREAMFLAGS_DONT_REMOVE);
 	}else{
-		SetModelIsDeletable(MI_FBIRANCH);
-		if(!HasModelLoaded(MI_FBIRANCH))
+		SetModelIsDeletable(MI_FBICAR);
+		if(!HasModelLoaded(MI_FBICAR))
 			SetModelIsDeletable(MI_FBI);
 	}
 
@@ -1664,6 +1709,7 @@ CStreaming::StreamVehiclesAndPeds(void)
 	else
 		SetModelIsDeletable(MI_CHOPPER);
 
+/*	LCS: removed
 	if (FindPlayerPed()->m_pWanted->AreMiamiViceRequired()) {
 		SetModelIsDeletable(MI_VICE1);
 		SetModelIsDeletable(MI_VICE2);
@@ -1705,6 +1751,7 @@ CStreaming::StreamVehiclesAndPeds(void)
 		SetModelIsDeletable(MI_VICE7);
 		SetModelIsDeletable(MI_VICE8);
 	}
+*/
 
 	if(timeBeforeNextLoad >= 0)
 		timeBeforeNextLoad--;
diff --git a/src/core/World.h b/src/core/World.h
index 59bf634c..b0e77193 100644
--- a/src/core/World.h
+++ b/src/core/World.h
@@ -16,7 +16,7 @@
 #define WORLD_SIZE_X (NUMSECTORS_X * SECTOR_SIZE_X)
 #define WORLD_SIZE_Y (NUMSECTORS_Y * SECTOR_SIZE_Y)
 
-#define WORLD_MIN_X (-2400.0f)
+#define WORLD_MIN_X (-2000.0f)
 #define WORLD_MIN_Y (-2000.0f)
 
 #define WORLD_MAX_X (WORLD_MIN_X + WORLD_SIZE_X)
diff --git a/src/core/Zones.cpp b/src/core/Zones.cpp
index 55b43c10..1715d811 100644
--- a/src/core/Zones.cpp
+++ b/src/core/Zones.cpp
@@ -88,20 +88,20 @@ CTheZones::Init(void)
 	TotalNumberOfInfoZones = 1;
 
 	strcpy(InfoZoneArray[0].name, "CITYINF");
-	InfoZoneArray[0].minx = -2400.0f;
+	InfoZoneArray[0].minx = -2000.0f;
 	InfoZoneArray[0].miny = -2000.0f;
 	InfoZoneArray[0].minz = -500.0f;
-	InfoZoneArray[0].maxx =  1600.0f;
+	InfoZoneArray[0].maxx =  2000.0f;
 	InfoZoneArray[0].maxy =  2000.0f;
 	InfoZoneArray[0].maxz =  500.0f;
 	InfoZoneArray[0].level = LEVEL_GENERIC;
 	InfoZoneArray[0].type = ZONE_INFO;
 
 	strcpy(NavigationZoneArray[0].name, "VICE_C");
-	NavigationZoneArray[0].minx = -2400.0f;
+	NavigationZoneArray[0].minx = -2000.0f;
 	NavigationZoneArray[0].miny = -2000.0f;
 	NavigationZoneArray[0].minz = -500.0f;
-	NavigationZoneArray[0].maxx =  1600.0f;
+	NavigationZoneArray[0].maxx =  2000.0f;
 	NavigationZoneArray[0].maxy =  2000.0f;
 	NavigationZoneArray[0].maxz =  500.0f;
 	NavigationZoneArray[0].level = LEVEL_GENERIC;
@@ -115,10 +115,10 @@ CTheZones::Init(void)
 	}
 	TotalNumberOfMapZones = 1;
 	strcpy(MapZoneArray[0].name, "THEMAP");
-	MapZoneArray[0].minx = -2400.0f;
+	MapZoneArray[0].minx = -2000.0f;
 	MapZoneArray[0].miny = -2000.0f;
 	MapZoneArray[0].minz = -500.0f;
-	MapZoneArray[0].maxx =  1600.0f;
+	MapZoneArray[0].maxx =  2000.0f;
 	MapZoneArray[0].maxy =  2000.0f;
 	MapZoneArray[0].maxz =  500.0f;
 	MapZoneArray[0].level = LEVEL_GENERIC;
diff --git a/src/core/config.h b/src/core/config.h
index 8fd3bc1c..85657e9c 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -7,15 +7,15 @@ enum Config {
 	MAX_CDIMAGES = 8, // additional cdimages
 	MAX_CDCHANNELS = 5,
 
-	MODELINFOSIZE = 6500,	// 4900 on PS2
-	TXDSTORESIZE = 1385,
-	COLSTORESIZE = 31,
+	MODELINFOSIZE = 6500,	// only 4900
+	TXDSTORESIZE = 1385,	// only 1200
+	COLSTORESIZE = 31,	// only 15
 	EXTRADIRSIZE = 256,
 	CUTSCENEDIRSIZE = 512,
 
 	SIMPLEMODELSIZE = 3885,
 	TIMEMODELSIZE = 385,
-	CLUMPMODELSIZE = 5,
+	CLUMPMODELSIZE = 10,
 	WEAPONMODELSIZE = 37,
 	PEDMODELSIZE = 130,
 	VEHICLEMODELSIZE = 110,
@@ -26,19 +26,19 @@ enum Config {
 	NUMOBJECTINFO = 210,
 
 	// Pool sizes
-	NUMPTRNODES = 50000,
-	NUMENTRYINFOS = 3200,
-	NUMPEDS = 140,
-	NUMVEHICLES = 110,
-	NUMBUILDINGS = 7000,
-	NUMTREADABLES = 1,
-	NUMOBJECTS = 460,
-	NUMDUMMIES = 2340,
+	NUMPTRNODES = 50000,	// only 30100
+	NUMENTRYINFOS = 4000,
+	NUMPEDS = 140,		// only 70
+	NUMVEHICLES = 110,	// only 70
+	NUMBUILDINGS = 7000,	// only 6757
+	NUMTREADABLES = 1300,
+	NUMOBJECTS = 475,
+	NUMDUMMIES = 3000,
 	NUMAUDIOSCRIPTOBJECTS = 192,
 	NUMCOLMODELS = 4400,
 	NUMCUTSCENEOBJECTS = 50,	// not a pool in VC
 
-	NUMANIMBLOCKS = 35,
+	NUMANIMBLOCKS = 60,
 	NUMANIMATIONS = 450,
 
 	NUMTEMPOBJECTS = 40,
@@ -58,13 +58,13 @@ enum Config {
 	NUMREFERENCES = 800,
 
 	// Zones
-	NUMAUDIOZONES = 14,
+	NUMAUDIOZONES = 36,
 	NUMINFOZONES = 169,
-	NUMMAPZONES = 39,
-	NUMNAVIGZONES = 20,
+	NUMMAPZONES = 110,
+	NUMNAVIGZONES = 70,
 
 	// Cull zones
-	NUMATTRIBZONES = 704,
+	NUMATTRIBZONES = 900,
 
 	NUMOCCLUSIONVOLUMES = 350,
 	NUMACTIVEOCCLUDERS = 48,
@@ -208,7 +208,7 @@ enum Config {
 #		define RANDOMSPLASH	// use random splash as on PS2
 #		define PS2_MATFX
 #	endif
-#	define PC_PLAYER_CONTROLS	// mouse player/cam mode
+//#	define PC_PLAYER_CONTROLS	// mouse player/cam mode
 #	define GTA_REPLAY
 #	define GTA_SCENE_EDIT
 #elif defined GTA_XBOX
@@ -256,7 +256,7 @@ enum Config {
 #define USE_TXD_CDIMAGE		// generate and load textures from txd.img
 #define PS2_ALPHA_TEST		// emulate ps2 alpha test 
 #define IMPROVED_VIDEOMODE	// save and load videomode parameters instead of a magic number
-#define DISABLE_LOADING_SCREEN // disable the loading screen which vastly improves the loading time
+//#define DISABLE_LOADING_SCREEN // disable the loading screen which vastly improves the loading time
 #define DISABLE_VSYNC_ON_TEXTURE_CONVERSION // make texture conversion work faster by disabling vsync
 //#define USE_TEXTURE_POOL
 #ifdef LIBRW
@@ -310,7 +310,7 @@ enum Config {
 
 #	ifdef CUSTOM_FRONTEND_OPTIONS
 #		define GRAPHICS_MENU_OPTIONS // otherwise Display settings will be scrollable
-#		define NO_ISLAND_LOADING  // disable loadscreen between islands via loading all island data at once, consumes more memory and CPU
+//#		define NO_ISLAND_LOADING  // disable loadscreen between islands via loading all island data at once, consumes more memory and CPU
 #		define CUTSCENE_BORDERS_SWITCH
 //#		define MULTISAMPLING		// adds MSAA option
 #		define INVERT_LOOK_FOR_PAD // enable the hidden option
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 0e5ed2af..3a5488d1 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -157,7 +157,7 @@ void CheckAndSaveIniFloat(const char *cat, const char *key, float val, bool &cha
 
 void LoadINISettings()
 {
-	cfg.load_file("reVC.ini");
+	cfg.load_file("reLCS.ini");
 
 #ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS
 	// Written by assuming the codes below will run after _InputInitialiseJoys().
@@ -260,7 +260,7 @@ void SaveINISettings()
 	CheckAndSaveIniInt("Rendering", "BackfaceCulling", gBackfaceCulling, changed);
 
 	if (changed)
-		cfg.write_file("reVC.ini");
+		cfg.write_file("reLCS.ini");
 }
 
 #endif
@@ -290,7 +290,6 @@ void FastWeatherCheat();
 void OnlyRenderWheelsCheat();
 void ChittyChittyBangBangCheat();
 void StrongGripCheat();
-void SpecialCarCheats();
 void PickUpChicksCheat();
 
 DebugMenuEntry *carCol1;
@@ -561,7 +560,6 @@ DebugMenuPopulate(void)
 		DebugMenuAddCmd("Cheats", "Only render wheels", OnlyRenderWheelsCheat);
 		DebugMenuAddCmd("Cheats", "Chitty chitty bang bang", ChittyChittyBangBangCheat);
 		DebugMenuAddCmd("Cheats", "Strong grip", StrongGripCheat);
-		DebugMenuAddCmd("Cheats", "Special car", SpecialCarCheats);
 		DebugMenuAddCmd("Cheats", "Pickup chicks", PickUpChicksCheat);
 
 		static int spawnCarId = MI_LANDSTAL;