2 files changed, 39 insertions, 17 deletions

diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp
index 7c71429a..7933cc1e 100644
--- a/src/peds/PlayerPed.cpp
+++ b/src/peds/PlayerPed.cpp
@@ -738,6 +738,7 @@ switchDetectDone:
 	}
 }
 
+// --MIAMI: Done
 void
 CPlayerPed::PlayerControlM16(CPad *padUsed)
 {
@@ -757,10 +758,19 @@ CPlayerPed::PlayerControlM16(CPad *padUsed)
 		TheCamera.ClearPlayerWeaponMode();
 	}
 
-	if (padUsed->GetWeapon()) {
-		CVector firePos(0.0f, 0.0f, 0.6f);
-		firePos = GetMatrix() * firePos;
-		GetWeapon()->Fire(this, &firePos);
+	if (padUsed->GetWeapon() && CTimer::GetTimeInMilliseconds() > GetWeapon()->m_nTimer) {
+		if (GetWeapon()->m_eWeaponState == WEAPONSTATE_OUT_OF_AMMO) {
+			DMAudio.PlayFrontEndSound(SOUND_WEAPON_SNIPER_SHOT_NO_ZOOM, 0.f);
+			GetWeapon()->m_nTimer = CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->m_nFiringRate + CTimer::GetTimeInMilliseconds();
+		} else {
+			CVector firePos(0.0f, 0.0f, 0.6f);
+			firePos = GetMatrix() * firePos;
+			GetWeapon()->Fire(this, &firePos);
+			m_nPadDownPressedInMilliseconds = CTimer::GetTimeInMilliseconds();
+		}
+	} else if (CTimer::GetTimeInMilliseconds() > GetWeapon()->m_nTimer &&
+		CTimer::GetTimeInMilliseconds() - CTimer::GetTimeStepInMilliseconds() < GetWeapon()->m_nTimer && GetWeapon()->m_eWeaponState != WEAPONSTATE_OUT_OF_AMMO) {
+		DMAudio.PlayFrontEndSound(SOUND_WEAPON_AK47_BULLET_ECHO, GetWeapon()->m_eWeaponType);
 	}
 	GetWeapon()->Update(m_audioEntityId, nil);
 }
@@ -1583,11 +1593,11 @@ CPlayerPed::ProcessControl(void)
 			}
 			break;
 		case PED_SNIPER_MODE:
-			if (FindPlayerPed()->GetWeapon()->m_eWeaponType == WEAPONTYPE_M4) {
+			if (GetWeapon()->m_eWeaponType == WEAPONTYPE_SNIPERRIFLE || GetWeapon()->m_eWeaponType == WEAPONTYPE_LASERSCOPE) {
 				if (padUsed)
-					PlayerControlM16(padUsed);
+					PlayerControlSniper(padUsed);
 			} else if (padUsed) {
-				PlayerControlSniper(padUsed);
+				PlayerControlM16(padUsed);
 			}
 			break;
 		case PED_SEEK_CAR:
diff --git a/src/weapons/Weapon.cpp b/src/weapons/Weapon.cpp
index d3b92b07..a895315e 100644
--- a/src/weapons/Weapon.cpp
+++ b/src/weapons/Weapon.cpp
@@ -194,8 +194,12 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
 
 	if ( GetInfo()->m_eWeaponFire != WEAPON_FIRE_MELEE )
 	{
-		if ( m_nAmmoInClip <= 0 )
-			return false;
+		if (m_nAmmoInClip <= 0) {
+			if (m_nAmmoTotal <= 0 || m_eWeaponState == WEAPONSTATE_RELOADING)
+				return false;
+
+			Reload();
+		}
 
 		switch ( m_eWeaponType )
 		{
@@ -223,10 +227,10 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
 			{
 				if ((TheCamera.PlayerWeaponMode.Mode == CCam::MODE_HELICANNON_1STPERSON || TheCamera.PlayerWeaponMode.Mode == CCam::MODE_M16_1STPERSON)
 					&& shooter == FindPlayerPed()) {
-					addFireRateAsDelay = false;
+					addFireRateAsDelay = true;
 					fired = FireM16_1stPerson(shooter);
 				} else {
-					addFireRateAsDelay = true;
+					addFireRateAsDelay = false;
 					fired = FireInstantHit(shooter, source);
 				}
 				break;
@@ -235,8 +239,11 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
 			case WEAPONTYPE_SNIPERRIFLE:
 			case WEAPONTYPE_LASERSCOPE:
 			{
-				fired = FireSniper(shooter);
-
+				if (shooter == FindPlayerPed()) {
+					fired = FireSniper(shooter);
+				} else {
+					fired = FireInstantHit(shooter, source);
+				}
 				break;
 			}
 
@@ -339,8 +346,12 @@ CWeapon::Fire(CEntity *shooter, CVector *fireSource)
 
 			if (m_nAmmoInClip == 0)
 			{
-				if (m_nAmmoTotal == 0)
+				if (m_nAmmoTotal == 0) {
+					if (TheCamera.Cams[TheCamera.ActiveCam].Mode == CCam::MODE_CAMERA)
+						CPad::GetPad(0)->Clear(false);
+
 					return true;
+				}
 
 				m_eWeaponState = WEAPONSTATE_RELOADING;
 				m_nTimer = CTimer::GetTimeInMilliseconds() + GetInfo()->m_nReload;
@@ -1026,7 +1037,7 @@ CWeapon::FireInstantHit(CEntity *shooter, CVector *fireSource)
 		{
 			static uint8 counter = 0;
 
-			if ( info->m_nFiringRate >= 50 && !(++counter & 1) )
+			if ( info->m_nFiringRate >= 50 || !(++counter & 1) )
 			{
 				AddGunFlashBigGuns(*fireSource, *fireSource + target);
 
@@ -2586,9 +2597,10 @@ CWeapon::Update(int32 audioEntity, CPed *pedToAdjustSound)
 
 			if ( CTimer::GetTimeInMilliseconds() > m_nTimer )
 			{
-				if ( GetInfo()->m_eWeaponFire != WEAPON_FIRE_MELEE && m_nAmmoTotal == 0 )
+				if ( GetInfo()->m_eWeaponFire != WEAPON_FIRE_MELEE && m_nAmmoTotal == 0 ) {
 					m_eWeaponState = WEAPONSTATE_OUT_OF_AMMO;
-				else
+					// TODO(Miami): CPickups::RemoveAllPickupsOfACertainWeaponGroupWithNoAmmo
+				} else
 					m_eWeaponState = WEAPONSTATE_READY;
 			}