9 files changed, 49 insertions, 26 deletions

diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp
index 1390d5f2..4bb782f2 100644
--- a/src/core/Camera.cpp
+++ b/src/core/Camera.cpp
@@ -114,6 +114,7 @@ CCamera::Init(void)
 	m_1rstPersonRunCloseToAWall = false;
 	m_fPositionAlongSpline = 0.0f;
 	m_bCameraJustRestored = false;
+	m_bFreezePedZoomSwitch = false;
 	Cams[0].Init();
 	Cams[1].Init();
 	Cams[2].Init();
@@ -985,7 +986,7 @@ CCamera::CamControl(void)
 			// Change user selected mode
 			if(CPad::GetPad(0)->CycleCameraModeUpJustDown() && !CReplay::IsPlayingBack() &&
 			   (m_bLookingAtPlayer || WhoIsInControlOfTheCamera == CAMCONTROL_OBBE) &&
-			   !m_WideScreenOn && !m_bFailedCullZoneTestPreviously && !m_bFirstPersonBeingUsed){
+			   !m_WideScreenOn && !m_bFailedCullZoneTestPreviously && !m_bFirstPersonBeingUsed && !m_bFreezePedZoomSwitch){
 				if(FrontEndMenuManager.m_ControlMethod == CONTROL_STANDARD){
 					if(PedZoomIndicator == CAM_ZOOM_3)
 						PedZoomIndicator = CAM_ZOOM_1;
diff --git a/src/core/Camera.h b/src/core/Camera.h
index 538ff067..9354e8ed 100644
--- a/src/core/Camera.h
+++ b/src/core/Camera.h
@@ -368,6 +368,7 @@ public:
 	bool m_bVehicleSuspenHigh;
 	bool m_bEnable1rstPersonCamCntrlsScript;
 	bool m_bAllow1rstPersonWeaponsCamera;
+	bool m_bFreezePedZoomSwitch;
 	bool m_bFailedCullZoneTestPreviously;
 
 	bool m_FadeTargetIsSplashScreen;
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 652b9db7..d8d6af8a 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -3378,9 +3378,9 @@ CMenuManager::Process(void)
 #ifdef XBOX_MESSAGE_SCREEN
 	ProcessDialogTimer();
 #endif
-
-	if (TheCamera.GetScreenFadeStatus() != FADE_0)
-		return;
+	// tmp hack to get saving to work
+	//if (TheCamera.GetScreenFadeStatus() != FADE_0)
+	//	return;
 
 	InitialiseChangedLanguageSettings();
 
diff --git a/src/core/Pad.h b/src/core/Pad.h
index 3a4f54b3..d913c16f 100644
--- a/src/core/Pad.h
+++ b/src/core/Pad.h
@@ -277,6 +277,16 @@ public:
 	uint32 InputHowLongAgo(void);
 	void SetDrunkInputDelay(int32 delay) { DrunkDrivingBufferUsed = delay; }
 
+	// TODO(LCS): properly, this is just to get some estimation for script
+	int16 GetOddJobTrigger() { return GetRightShockJustDown(); }
+	int16 GuiLeft() { return GetAnaloguePadLeft() || GetDPadLeftJustDown(); }
+	int16 GuiRight() { return GetAnaloguePadRight() || GetDPadRightJustDown(); }
+	int16 GuiUp() { return GetAnaloguePadUp() || GetDPadUpJustDown(); }
+	int16 GuiDown() { return GetAnaloguePadDown() || GetDPadDownJustDown(); }
+	int16 GuiSelect() { return GetCrossJustDown(); }
+	int16 GuiBack() { return GetTriangleJustDown(); }
+	int16 GetSkipCutscene() { return GetCrossJustDown(); }
+
 #ifdef XINPUT
 	void AffectFromXinput(uint32 pad);
 #endif
diff --git a/src/core/PlayerInfo.cpp b/src/core/PlayerInfo.cpp
index f0f3e2c6..64f3b9d0 100644
--- a/src/core/PlayerInfo.cpp
+++ b/src/core/PlayerInfo.cpp
@@ -420,8 +420,10 @@ CPlayerInfo::Process(void)
 				CTimer::Update();
 			}
 			m_bInRemoteMode = false;
-			CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle->bRemoveFromWorld = true;
-			CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle = nil;
+			if (CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle) {
+				CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle->bRemoveFromWorld = true;
+				CWorld::Players[CWorld::PlayerInFocus].m_pRemoteVehicle = nil;
+			}
 			if (FindPlayerVehicle()) {
 				FindPlayerVehicle()->SetStatus(STATUS_PLAYER);
 			}
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index 50a8652a..c93876b3 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -1133,6 +1133,7 @@ void CRadar::SetRadarMarkerState(int32 counter, bool flag)
 }
 
 void CRadar::ShowRadarMarker(CVector pos, uint32 color, float radius) {
+	/*
 	float f1 = radius * 1.4f;
 	float f2 = radius * 0.5f;
 	CVector p1, p2;
@@ -1152,6 +1153,7 @@ void CRadar::ShowRadarMarker(CVector pos, uint32 color, float radius) {
 	p1 = pos - TheCamera.GetRight()*f1;
 	p2 = pos - TheCamera.GetRight()*f2;
 	CTheScripts::ScriptDebugLine3D(p1.x, p1.y, p1.z, p2.x, p2.y, p2.z, color, color);
+	*/
 }
 
 void CRadar::ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha)
diff --git a/src/core/config.h b/src/core/config.h
index 02356e6e..9afdcc7f 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -198,6 +198,7 @@ enum Config {
 //#define ANIM_COMPRESSION	// only keep most recently used anims uncompressed
 
 #define GTA_TRAIN
+//#define GTA_BRIDGE
 
 #if defined GTA_PS2
 #	define GTA_PS2_STUFF
@@ -211,7 +212,7 @@ enum Config {
 #		define PS2_MATFX
 #	endif
 #	define PC_PLAYER_CONTROLS	// mouse player/cam mode
-#	define GTA_REPLAY
+//#	define GTA_REPLAY
 #	define GTA_SCENE_EDIT
 #elif defined GTA_XBOX
 #endif
diff --git a/src/core/main.cpp b/src/core/main.cpp
index bbfb588c..c6624aa5 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -1279,7 +1279,7 @@ RenderScene(void)
 void
 RenderDebugShit(void)
 {
-	CTheScripts::RenderTheScriptDebugLines();
+	//CTheScripts::RenderTheScriptDebugLines();
 #ifndef FINAL
 	if(gbShowCollisionLines)
 		CRenderer::RenderCollisionLines();
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 12b49c9a..cc3e93cb 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -741,24 +741,30 @@ extern bool gbRenderDebugEnvMap;
 #ifdef MISSION_SWITCHER
 		DebugMenuEntry *missionEntry;
 		static const char* missions[] = {
-			"Initial", "Intro", "An Old Friend", "The Party", "Back Alley Brawl", "Jury Fury", "Riot",
-			"Treacherous Swine", "Mall Shootout", "Guardian Angels", "Sir, Yes Sir!", "All Hands On Deck!",
-			"The Chase", "Phnom Penh '86", "The Fastest Boat", "Supply & Demand", "Rub Out", "Death Row",
-			"Four Iron", "Demolition Man", "Two Bit Hit", "No Escape?", "The Shootist", "The Driver",
-			"The Job", "Gun Runner", "Boomshine Saigon", "Recruitment Drive", "Dildo Dodo", "Martha's Mug Shot",
-			"G-spotlight", "Shakedown", "Bar Brawl", "Cop Land", "Spilling the Beans", "Hit the Courier",
-			"Printworks Buy", "Sunshine Autos", "Interglobal Films Buy", "Cherry Popper Icecreams Buy",
-			"Kaufman Cabs Buy", "Malibu Club Buy", "The Boatyard Buy", "Pole Position Club Buy", "El Swanko Casa Buy",
-			"Links View Apartment Buy", "Hyman Condo Buy", "Ocean Heighs Aprt. Buy", "1102 Washington Street Buy",
-			"Vice Point Buy", "Skumole Shack Buy", "Cap the Collector", "Keep your Friends Close...",
-			"Alloy Wheels of Steel", "Messing with the Man", "Hog Tied", "Stunt Boat Challenge", "Cannon Fodder",
-			"Naval Engagement", "Trojan Voodoo", "Juju Scramble", "Bombs Away!", "Dirty Lickin's", "Love Juice",
-			"Psycho Killer", "Publicity Tour", "Weapon Range", "Road Kill", "Waste the Wife", "Autocide",
-			"Check Out at the Check In", "Loose Ends", "V.I.P.", "Friendly Rivalry", "Cabmaggedon", "TAXI DRIVER",
-			"PARAMEDIC", "FIREFIGHTER", "VIGILANTE", "HOTRING", "BLOODRING", "DIRTRING", "Sunshine Autos Races",
-			"Distribution", "Downtown Chopper Checkpoint", "Ocean Beach Chopper Checkpoint", "Vice Point Chopper Checkpoint",
-			"Little Haiti Chopper Checkpoint", "Trial by Dirt", "Test Track", "PCJ Playground", "Cone Crazy",
-			"PIZZA BOY", "RC Raider Pickup", "RC Bandit Race", "RC Baron Race", "Checkpoint Charlie"
+			"initial: objects", "initial: hidden packages", "initial: car generators", "initial: pickups", "initial: unique stunt jumps",
+			"initial: player", "initial: general info", "initial: lods", "initial: weapons", "Home Sweet Home", "Taxi-Driver Sub-Mission",
+			"Paramedic Sub-Mission", "Vigilante Sub-Mission", "Karmageddon", "Firefighter Sub-Mission", "Trash Dash", "RC Triad Take-Down",
+			"Thrashin' RC", "Ragin' RC", "Chasin' RC", "GO GO Faggio", "Noodleboy", "Pizzaboy", "Wong Side Of The Tracks", "Bumps and Grinds: Course 1",
+			"Bumps and Grinds: Course 2", "Bumps and Grinds: Course 3", "Bumps and Grinds: Course 4", "Bumps and Grinds: Course 5", "Bumps and Grinds: Course 6",
+			"Bumps and Grinds: Course 7", "Bumps and Grinds: Course 8", "Bumps and Grinds: Course 9", "Bumps and Grinds: Course 10", "Car Salesman", "Bike Salesman",
+			"RACE: Low-Rider Rumble", "RACE: Deimos Dash", "RACE: Wi-Cheetah Run", "RACE: Red Light Racing", "RACE: Torrington TT", "RACE: Gangsta GP",
+			"Scooter Shooter", "AWOL Angel", "9mm Mayhem", "Scrapyard Challenge", "See the Sight Before your Flight", "SlashTV", "Slacker (Vincenzo)",
+			"Dealing Revenge (Vincenzo)", "Snuff (Vincenzo)", "Smash and Grab (Vincenzo)", "Hot Wheels (Vincenzo)", "The Portland Chainsaw Masquerade (Vincenzo)",
+			"The Offer (Salvatore)", "Ho Selecta! (Salvatore)", "Frighteners (Salvatore)", "Rollercoaster Ride (Salvatore)", "Contra-Banned (Salvatore)",
+			"Sindacco Sabotage (Salvatore)", "The Trouble with Triads (Salvatore)", "Driving Mr Leone (Salvatore)", "conversation (JD)", "Bone Voyeur! (JD)",
+			"Don in 60 Seconds (JD)", "A Volatile Situation (JD)", "Blow up 'Dolls' (JD)", "Salvatore's Salvation (JD)", "The Guns of Leone (JD)",
+			"Calm before the Storm (JD)", "The Made Man (JD)", "Snappy Dresser (Ma Cipriani)", "Big Rumble in Little China (Ma Cipriani)", "Grease Sucho (Ma Cipriani)",
+			"Dead Meat (Ma Cipriani)", "No Son of Mine (Ma Cipriani)", "Shop 'til you Strop (Maria)", "Taken for a Ride (Maria)", "Booby Prize (Maria)",
+			"Biker Heat (Maria)", "Overdose of Trouble (Maria)", "Making Toni (Salvatore)", "A Walk In The Park (Salvatore)", "Caught In The Act (Salvatore)",
+			"Search And Rescue (Salvatore)", "Taking The Peace (Salvatore)", "Shoot The Messenger (Salvatore)", "Sayonara Sindaccos (Leon McAffrey)",
+			"The Whole 9 Yardies (Leon McAffrey)", "Crazy '69' (Leon McAffrey)", "Night Of The Livid Dreads (Leon McAffrey)", "Munitions Dump (Leon McAffrey)",
+			"The Morgue Party Candidate (Donald Love)", "Steering The Vote (Donald Love)", "Cam-Pain (Donald Love)", "Friggin' The Riggin' (Donald Love)",
+			"Love & Bullets (Donald Love)", "Counterfeit Count (Donald Love)", "Love On The Rocks (Donald Love)", "L.C. Confidential (Church Confessional)",
+			"The Passion Of The Heist (Church Confessional)", "Karmageddon (Church Confessional)", "False Idols (Church Confessional)", "Rough Justice (Salvatore)",
+			"Dead Reckoning (Salvatore)", "Shogun Showdown (Salvatore)", "The Shoreside Redemption (Salvatore)", "The Sicilian Gambit (Salvatore)",
+			"Panlantic Land Grab (Donald Love)", "Stop the Press (Donald Love)", "Morgue Party Resurrection (Donald Love)", "No Money, Mo' Problems (Donald Love)",
+			"Bringing the House Down (Donald Love)", "Love on the Run (Donald Love)", "More Deadly than the Male (Toshiko Kasen)", "Cash Clash (Toshiko Kasen)",
+			"A Date with Death (Toshiko Kasen)", "Cash in Kazuki's Chips (Toshiko Kasen)"
 		};
 
 		missionEntry = DebugMenuAddVar("Debug", "Select mission", &nextMissionToSwitch, nil, 1, 0, 96, missions);