diff options
| author | eray orçunus <erayorcunus@gmail.com> | 2020-06-20 16:30:28 +0200 |
|---|---|---|
| committer | eray orçunus <erayorcunus@gmail.com> | 2020-06-20 16:30:28 +0200 |
| commit | 2d2833f2e4f038f37cf75025e98476a4f1ad9a13 (patch) | |
| tree | 7764969828ee3e9218912bf1e448493e62a4545f /src/peds | |
| parent | Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami (diff) | |
| download | re3-2d2833f2e4f038f37cf75025e98476a4f1ad9a13.tar re3-2d2833f2e4f038f37cf75025e98476a4f1ad9a13.tar.gz re3-2d2833f2e4f038f37cf75025e98476a4f1ad9a13.tar.bz2 re3-2d2833f2e4f038f37cf75025e98476a4f1ad9a13.tar.lz re3-2d2833f2e4f038f37cf75025e98476a4f1ad9a13.tar.xz re3-2d2833f2e4f038f37cf75025e98476a4f1ad9a13.tar.zst re3-2d2833f2e4f038f37cf75025e98476a4f1ad9a13.zip | |
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/PlayerPed.cpp | 24 |
1 files changed, 17 insertions, 7 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: |