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

src/peds/Ped.cpp

@@ -2583,39 +2583,15 @@ CPed::ProcessControl(void)
 			if (m_nWaitState != WAITSTATE_FALSE)
 				Wait();
 
-			switch (m_nPedState) {
-				case PED_IDLE:
-					Idle();
-					break;
-				case PED_LOOK_ENTITY:
-				case PED_LOOK_HEADING:
-					Look();
-					break;
-				case PED_WANDER_RANGE:
-					// III has these in here(and they were unused):
-					/*
-					WanderRange();
-					CheckAroundForPossibleCollisions();
-					*/
-					break;
-				case PED_WANDER_PATH:
-					WanderPath();
-					break;
-				case PED_ENTER_CAR:
-				case PED_CARJACK:
-				{
 #ifdef CANCELLABLE_CAR_ENTER
-					if (!IsPlayer() || !m_pVehicleAnim)
+			static bool cancelJack = false;
-						break;
+			if (IsPlayer()) {
-
+				if (EnteringCar() && m_pVehicleAnim) {
 					CPad *pad = CPad::GetPad(0);
 
-					if (pad->ArePlayerControlsDisabled())
+					if (!pad->ArePlayerControlsDisabled()) {
-						break;
-
 						int vehAnim = m_pVehicleAnim->animId;
 
-					static bool cancelJack = false;
 						int16 padWalkX = pad->GetPedWalkLeftRight();
 						int16 padWalkY = pad->GetPedWalkUpDown();
 						if (Abs(padWalkX) > 0.0f || Abs(padWalkY) > 0.0f) {
@@ -2643,7 +2619,33 @@ CPed::ProcessControl(void)
 							cancelJack = false;
 							bCancelEnteringCar = true;
 						}
+					}
+				} else
+					cancelJack = false;
+			}
 #endif
+
+			switch (m_nPedState) {
+				case PED_IDLE:
+					Idle();
+					break;
+				case PED_LOOK_ENTITY:
+				case PED_LOOK_HEADING:
+					Look();
+					break;
+				case PED_WANDER_RANGE:
+					// III has these in here(and they were unused):
+					/*
+					WanderRange();
+					CheckAroundForPossibleCollisions();
+					*/
+					break;
+				case PED_WANDER_PATH:
+					WanderPath();
+					break;
+				case PED_ENTER_CAR:
+				case PED_CARJACK:
+				{
 					break;
 				}
 				case PED_FLEE_POS:

src/peds/PedAI.cpp

@@ -5899,17 +5899,21 @@ CPed::Duck(void)
 		ClearDuck();
 	else if (bIsDucking && bCrouchWhenShooting) {
 		CWeaponInfo *weapon = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType);
-		CAnimBlendAssociation *attackAssoc = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCH);
+		CAnimBlendAssociation *crouchAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_WEAPON_CROUCH);
-		if (!attackAssoc) {
+		if (!crouchAnim) {
 			if(GetCrouchFireAnim(weapon))
-				attackAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchFireAnim(weapon));
+				crouchAnim = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchFireAnim(weapon));
 		}
-		if (!attackAssoc) {
+		if (!crouchAnim) {
 			if(GetCrouchReloadAnim(weapon))
-				attackAssoc = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchReloadAnim(weapon));
+				crouchAnim = RpAnimBlendClumpGetAssociation(GetClump(), GetCrouchReloadAnim(weapon));
 		}
-		if (!attackAssoc) {
+		if (!crouchAnim) {
 			bIsDucking = false;
+#if defined FIX_BUGS || defined FREE_CAM
+			if (IsPlayer())
+				bCrouchWhenShooting = false;
+#endif
 		}
 	}
 }

src/peds/PlayerPed.cpp

@@ -1331,7 +1331,9 @@ CPlayerPed::ProcessPlayerWeapon(CPad *padUsed)
 
 #ifdef FREE_CAM
 	static int8 changedHeadingRate = 0;
+	static int8 pointedGun = 0;
 	if (changedHeadingRate == 2) changedHeadingRate = 1;
+	if (pointedGun == 2) pointedGun = 1;
 
 	// Rotate player/arm when shooting. We don't have auto-rotation anymore
 	if (CCamera::m_bUseMouse3rdPerson && CCamera::bFreeCam &&
@@ -1346,10 +1348,10 @@ CPlayerPed::ProcessPlayerWeapon(CPad *padUsed)
 				// On this one we can rotate arm.
 				if (CAN_AIM_WITH_ARM) {
 					if (!padUsed->GetWeapon()) { // making this State != ATTACK still stops it after attack. Re-start it immediately!
-						SetWeaponLockOnTarget(nil);
+						SetPointGunAt(nil);
 						bIsPointingGunAt = false; // to not stop after attack
 					}
-
+					pointedGun = 2;
 					SetLookFlag(limitedCam, true);
 					SetAimFlag(limitedCam);
 					SetLookTimer(INT32_MAX); // removing this makes head move for real, but I experinced some bugs.
@@ -1373,8 +1375,7 @@ CPlayerPed::ProcessPlayerWeapon(CPad *padUsed)
 						m_fRotationCur += (limitedRotDest - m_fRotationCur) / 2;
 					}
 				}
-			} else if (CAN_AIM_WITH_ARM && m_nPedState != PED_ATTACK)
+			}
-				ClearPointGunAt();
 		}
 #undef CAN_AIM_WITH_ARM
 	}
@@ -1382,6 +1383,10 @@ CPlayerPed::ProcessPlayerWeapon(CPad *padUsed)
 		changedHeadingRate = 0;
 		RestoreHeadingRate();
 	}
+	if (pointedGun == 1 && m_nPedState != PED_ATTACK) {
+		pointedGun = 0;
+		ClearPointGunAt();
+	}
 #endif
 
 	if (padUsed->GetTarget() && m_nSelectedWepSlot == m_currentWeapon && m_nMoveState != PEDMOVE_SPRINT && !TheCamera.Using1stPersonWeaponMode() && weaponInfo->m_bCanAim) {