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

codewarrior/reVC.mcp.xml

@@ -187,7 +187,7 @@
                     </SETTING>
                     <SETTING>
                         <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>..\src\render</VALUE></SETTING>
+                            <SETTING><NAME>Path</NAME><VALUE>..\src\renderer</VALUE></SETTING>
                             <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
                             <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
                         </SETTING>
@@ -6712,7 +6712,7 @@
                     </SETTING>
                     <SETTING>
                         <SETTING><NAME>SearchPath</NAME>
-                            <SETTING><NAME>Path</NAME><VALUE>..\src\render</VALUE></SETTING>
+                            <SETTING><NAME>Path</NAME><VALUE>..\src\renderer</VALUE></SETTING>
                             <SETTING><NAME>PathFormat</NAME><VALUE>Windows</VALUE></SETTING>
                             <SETTING><NAME>PathRoot</NAME><VALUE>Project</VALUE></SETTING>
                         </SETTING>
@@ -14909,7 +14909,7 @@
                 <PATHFORMAT>Windows</PATHFORMAT>
             </FILEREF>
         </GROUP>
-        <GROUP><NAME>render</NAME>
+        <GROUP><NAME>renderer</NAME>
             <FILEREF>
                 <TARGETNAME>Debug</TARGETNAME>
                 <PATHTYPE>Name</PATHTYPE>

premake5.lua

@@ -264,7 +264,7 @@ project "reVC"
 	files { addSrcFiles("src/modelinfo") }
 	files { addSrcFiles("src/objects") }
 	files { addSrcFiles("src/peds") }
-	files { addSrcFiles("src/render") }
+	files { addSrcFiles("src/renderer") }
 	files { addSrcFiles("src/rw") }
 	files { addSrcFiles("src/save") }
 	files { addSrcFiles("src/skel") }
@@ -293,7 +293,7 @@ project "reVC"
 	includedirs { "src/modelinfo" }
 	includedirs { "src/objects" }
 	includedirs { "src/peds" }
-	includedirs { "src/render" }
+	includedirs { "src/renderer" }
 	includedirs { "src/rw" }
 	includedirs { "src/save/" }
 	includedirs { "src/skel/" }

src/audio/AudioLogic.cpp

@@ -2955,7 +2955,7 @@ cAudioManager::ProcessVehicleOneShots(cVehicleParams& params)
 				CPed *pPed = params.m_pVehicle->pDriver;
 				if(!pPed)
 					break;
-				if(!pPed->HasWeaponSlot(WEAPONSLOT_SUBMACHINEGUN)) {
+				if(!pPed->HasWeaponSlot(WEAPONSLOT_SUBMACHINEGUN) || (params.m_pVehicle->GetModelIndex() == MI_PREDATOR && !pPed->IsPedDoingDriveByShooting())) {
 					sampleIndex = SFX_UZI_LEFT;
 					frequency = SampleManager.GetSampleBaseFrequency(sampleIndex);
 					frequency += RandomDisplacement(frequency / 32);

src/control/Garages.cpp

@@ -2259,6 +2259,9 @@ void CGarages::Save(uint8 * buf, uint32 * size)
 //INITSAVEBUF
 	*size = 7876; // for some reason it's not actual size again
 	//*size = (6 * sizeof(uint32) + TOTAL_COLLECTCARS_GARAGES * sizeof(*CarTypesCollected) + sizeof(uint32) + TOTAL_HIDEOUT_GARAGES * NUM_GARAGE_STORED_CARS * sizeof(CStoredCar) + NUM_GARAGES * sizeof(CGarage));
+#if !defined THIS_IS_STUPID && defined COMPATIBLE_SAVES
+	memset(buf + 7340, 0, *size - 7340); // garbage data is written otherwise
+#endif
 	CloseHideOutGaragesBeforeSave();
 	WriteSaveBuf(buf, NumGarages);
 	WriteSaveBuf(buf, (uint32)BombsAreFree);

src/control/Script5.cpp

@@ -1913,7 +1913,7 @@ bool CRunningScript::CheckDamagedWeaponType(int32 actual, int32 type)
 	if (type == WEAPONTYPE_ANYMELEE) {
 		if (actual <= WEAPONTYPE_CHAINSAW)
 			return true;
-		if (actual - WEAPONTYPE_GRENADE <= WEAPONTYPE_MINIGUN)
+		if (actual >= WEAPONTYPE_GRENADE && actual <= WEAPONTYPE_UNIDENTIFIED)
 			return false;
 		return false;
 	}

src/core/PlayerInfo.h

@@ -54,7 +54,7 @@ public:
 	int32 m_nUpsideDownCounter;
 	int32 field_EC;
 	int32 m_nTimeCarSpentOnTwoWheels;
-	int32 m_nDistanceCarTravelledOnTwoWheels;
+	float m_nDistanceCarTravelledOnTwoWheels;
 	int32 m_nTimeNotFullyOnGround;
 	int32 m_nTimeSpentOnWheelie;
 	float m_nDistanceTravelledOnWheelie;
@@ -62,11 +62,11 @@ public:
 	float m_nDistanceTravelledOnStoppie;
 	int32 m_nCancelWheelStuntTimer;
 	int32 m_nLastTimeCarSpentOnTwoWheels;
-	int32 m_nLastDistanceCarTravelledOnTwoWheels;
+	float m_nLastDistanceCarTravelledOnTwoWheels;
 	int32 m_nLastTimeSpentOnWheelie;
-	int32 m_nLastDistanceTravelledOnWheelie;
+	float m_nLastDistanceTravelledOnWheelie;
 	int32 m_nLastTimeSpentOnStoppie;
-	int32 m_nLastDistanceTravelledOnStoppie;
+	float m_nLastDistanceTravelledOnStoppie;
 	int16 m_nTrafficMultiplier;
 	int16 field_12A;
 	float m_fRoadDensity;

src/peds/Ped.cpp

@@ -2362,12 +2362,12 @@ CPed::ProcessControl(void)
 						} else {
 							obstacleForFlyingOtherDirZ = 501.0f;
 						}
-						uint8 flyDir = 0;
+						int16 flyDir = 0;
 						float feetZ = GetPosition().z - FEET_OFFSET;
 #ifdef FIX_BUGS
-						if (obstacleForFlyingZ > feetZ && obstacleForFlyingOtherDirZ < 501.0f)
+						if (obstacleForFlyingZ > feetZ && obstacleForFlyingZ < 500.0f)
 							flyDir = 1;
-						else if (obstacleForFlyingOtherDirZ > feetZ && obstacleForFlyingZ < 500.0f)
+						else if (obstacleForFlyingOtherDirZ > feetZ && obstacleForFlyingOtherDirZ < 501.0f)
 							flyDir = 2;
 #else
 						if ((obstacleForFlyingZ > feetZ && obstacleForFlyingOtherDirZ < 500.0f) || (obstacleForFlyingZ > feetZ && obstacleForFlyingOtherDirZ > feetZ))
@@ -2376,8 +2376,8 @@ CPed::ProcessControl(void)
 							flyDir = 2;
 #endif
 
-						if (flyDir != 0 && !bHeadStuckInCollision) {
+						if (flyDir > 0 && !bHeadStuckInCollision) {
-							SetPosition((flyDir == 2 ? obstacleForFlyingOtherDir.point : obstacleForFlying.point));
+							GetMatrix().SetTranslateOnly(flyDir == 2 ? obstacleForFlyingOtherDir.point : obstacleForFlying.point);
 							GetMatrix().GetPosition().z += FEET_OFFSET;
 							GetMatrix().UpdateRW();
 							SetLanding();
@@ -3009,7 +3009,7 @@ CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints)
 							lowerSpeedLimit *= 1.5f;
 						}
 						CAnimBlendAssociation *fallAnim = RpAnimBlendClumpGetAssociation(GetClump(), ANIM_STD_FALL);
-						if (!bWasStanding && speed > upperSpeedLimit && (!bPushedAlongByCar || m_vecMoveSpeed.z < lowerSpeedLimit)
+						if (!bWasStanding && ((speed > upperSpeedLimit && !bPushedAlongByCar) || (m_vecMoveSpeed.z < lowerSpeedLimit))
 							&& m_pCollidingEntity != collidingEnt) {
 
 							float damage = 100.0f * Max(speed - 0.25f, 0.0f);

src/peds/PedFight.cpp

@@ -352,6 +352,14 @@ CPed::SetAttack(CEntity *victim)
 			SetAimFlag(m_fRotationCur);
 		}
 	}
+#ifdef FIX_BUGS
+	// fix aiming for flamethrower and minigun while using PC controls
+	else if (curWeapon->m_AnimToPlay == ASSOCGRP_FLAMETHROWER && TheCamera.Cams[0].Using3rdPersonMouseCam() && this == FindPlayerPed())
+	{
+		SetAimFlag(m_fRotationCur);
+		((CPlayerPed*)this)->m_fFPSMoveHeading = TheCamera.Find3rdPersonQuickAimPitch();
+	}
+#endif
 	if (m_nPedState == PED_ATTACK) {
 		bIsAttacking = true;
 		return;

src/weapons/Weapon.cpp

@@ -3182,7 +3182,7 @@ bool
 CPed::IsPedDoingDriveByShooting(void)
 {
 #ifdef FIX_BUGS
-	if (FindPlayerPed() == this && CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_nWeaponSlot == 5) {
+	if (FindPlayerPed() == this && CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_nWeaponSlot == WEAPONSLOT_SUBMACHINEGUN) {
 #else
 	if (FindPlayerPed() == this && GetWeapon()->m_eWeaponType == WEAPONTYPE_UZI) {
 #endif