Merge branch 'miami' of github.com:GTAmodding/re3 into miami

src/core/Collision.cpp

@@ -1861,6 +1861,19 @@ CColTrianglePlane::Set(const CVector *v, CColTriangle &tri)
 		dir = normal.z < 0.0f ? DIR_Z_NEG : DIR_Z_POS;
 }
 
+CColPoint&
+CColPoint::operator=(const CColPoint& other)
+{
+	point = other.point;
+	normal = other.normal;
+	surfaceA = other.surfaceA;
+	pieceA = other.pieceA;
+	surfaceB = other.surfaceB;
+	pieceB = other.pieceB;
+	// doesn't copy depth
+	return *this;
+}
+
 CColModel::CColModel(void)
 {
 	numSpheres = 0;

src/core/Collision.h

@@ -89,6 +89,8 @@ struct CColPoint
 	uint8 surfaceB;
 	uint8 pieceB;
 	float depth;
+
+	CColPoint& operator=(const CColPoint& other);
 };
 
 struct CStoredCollPoly

src/core/ControllerConfig.cpp

@@ -767,7 +767,7 @@ void CControllerConfigManager::AffectControllerStateOn_ButtonDown_FirstPersonOnl
 	if (button == GetControllerKeyAssociatedWithAction(PED_SNIPER_ZOOM_OUT, type))
 		state.Cross = 255;
 	if (button == GetControllerKeyAssociatedWithAction(PED_DUCK, type))
-		state.RightShock = 255;
+		state.LeftShock = 255;
 }
 
 void CControllerConfigManager::AffectControllerStateOn_ButtonDown_ThirdPersonOnly(int32 button, eControllerType type, CControllerState &state)
@@ -785,7 +785,7 @@ void CControllerConfigManager::AffectControllerStateOn_ButtonDown_ThirdPersonOnl
 	if (button == GetControllerKeyAssociatedWithAction(PED_SPRINT, type))
 		state.Cross = 255;
 	if (button == GetControllerKeyAssociatedWithAction(PED_DUCK, type))
-		state.RightShock = 255;
+		state.LeftShock = 255;
 	
 	if (FrontEndMenuManager.m_ControlMethod == CONTROL_CLASSIC)
 	{

src/core/Pad.cpp

@@ -2336,6 +2336,14 @@ bool CPad::TargetJustDown(void)
 	return false;
 }
 
+bool CPad::DuckJustDown(void)
+{
+	if (ArePlayerControlsDisabled())
+		return false;
+
+	return !!(NewState.LeftShock && !OldState.LeftShock);
+}
+
 bool CPad::JumpJustDown(void)
 {
 	if ( ArePlayerControlsDisabled() )

src/core/Pad.h

@@ -237,6 +237,7 @@ public:
 	bool CycleWeaponRightJustDown(void);
 	bool GetTarget(void);
 	bool TargetJustDown(void);
+	bool DuckJustDown(void);
 	bool JumpJustDown(void);
 	bool GetSprint(void);
 	bool ShiftTargetLeftJustDown(void);

src/core/PlayerInfo.cpp

@@ -146,6 +146,8 @@ CPlayerInfo::Clear(void)
 	m_bDriveByAllowed = true;
 	m_nPreviousTimeRewardedForExplosion = 0;
 	m_nExplosionsSinceLastReward = 0;
+	m_nHavocLevel = 0;
+	m_fMediaAttention = 0;
 	m_nCurrentBustedAudio = 1;
 	m_nBustedAudioStatus = BUSTEDAUDIO_NONE;
 }