diff options
Diffstat (limited to '')
| -rw-r--r-- | src/peds/CopPed.cpp | 4 | ||||
| -rw-r--r-- | src/peds/Ped.cpp | 24 | ||||
| -rw-r--r-- | src/peds/PedAI.cpp | 4 | ||||
| -rw-r--r-- | src/peds/PedDebug.cpp | 3 | ||||
| -rw-r--r-- | src/peds/PedFight.cpp | 4 | ||||
| -rw-r--r-- | src/peds/PlayerPed.cpp | 2 |
6 files changed, 29 insertions, 12 deletions
diff --git a/src/peds/CopPed.cpp b/src/peds/CopPed.cpp index 36bb02b6..f2f3ee27 100644 --- a/src/peds/CopPed.cpp +++ b/src/peds/CopPed.cpp @@ -555,7 +555,7 @@ CCopPed::CopAI(void) if (CWorld::GetIsLineOfSightClear(GetPosition(), nearPed->GetPosition(), true, false, false, false, false, false, false)) { - Say(SOUND_PED_COP_REACTION); + Say(SOUND_PED_COP_ASK_FOR_ID); SetObjective(OBJECTIVE_HASSLE_CHAR, nearPed); nearPed->SetObjective(OBJECTIVE_WAIT_ON_FOOT_FOR_COP, this); m_nHassleTimer = CTimer::GetTimeInMilliseconds() + 100000; @@ -747,7 +747,7 @@ CCopPed::ProcessControl(void) } if (m_pPointGunAt) - Say(SOUND_PED_COP_UNK_129); + Say(SOUND_PED_COP_TARGETING); if (m_bStopAndShootDisabledZone) { bool dontShoot = false; diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 342cba2d..fe105645 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -7768,19 +7768,33 @@ void CPed::LookForSexyPeds(void) { if ((!IsPedInControl() && m_nPedState != PED_DRIVING) - || m_lookTimer >= CTimer::GetTimeInMilliseconds() || m_nPedType != PEDTYPE_CIVMALE) + || m_lookTimer >= CTimer::GetTimeInMilliseconds() || +#ifdef FIX_BUGS + (m_nPedType != PEDTYPE_CIVMALE) && !IsFemale() && (m_nPedType != PEDTYPE_CRIMINAL) && !IsGangMember() +#else + m_nPedType != PEDTYPE_CIVMALE +#endif + ) return; for (int i = 0; i < m_numNearPeds; i++) { if (CanSeeEntity(m_nearPeds[i])) { if ((GetPosition() - m_nearPeds[i]->GetPosition()).Magnitude() < 10.0f) { CPed *nearPed = m_nearPeds[i]; - if ((nearPed->m_pedStats->m_sexiness > m_pedStats->m_sexiness) - && nearPed->m_nPedType == PEDTYPE_CIVFEMALE) { + if((nearPed->m_pedStats->m_sexiness > m_pedStats->m_sexiness) +#ifdef FIX_BUGS + && ((IsFemale() && !nearPed->IsFemale()) || (!IsFemale() && nearPed->IsFemale()))) { +#else + && nearPed->m_nPedType == PEDTYPE_CIVFEMALE) { +#endif SetLookFlag(nearPed, true); m_lookTimer = CTimer::GetTimeInMilliseconds() + 4000; - Say(SOUND_PED_CHAT_SEXY); +#ifdef FIX_BUGS + Say(IsFemale() ? SOUND_PED_CHAT_SEXY_FEMALE : SOUND_PED_CHAT_SEXY_MALE); +#else + Say(SOUND_PED_CHAT_SEXY_MALE); +#endif return; } } @@ -8734,7 +8748,7 @@ CPed::Wait(void) if ((GetPosition() - nearPed->GetPosition()).MagnitudeSqr() < sq(10.f)) { for (int anim = ANIM_STRIP_A; anim <= ANIM_STRIP_G; anim++) { if (RpAnimBlendClumpGetAssociation(nearPed->GetClump(), anim)) - Say(SOUND_PED_149); + Say(SOUND_PED_JEER); } } } diff --git a/src/peds/PedAI.cpp b/src/peds/PedAI.cpp index cd8b06fa..c4d6df39 100644 --- a/src/peds/PedAI.cpp +++ b/src/peds/PedAI.cpp @@ -1076,8 +1076,8 @@ CPed::ProcessObjective(void) SetMoveState(PEDMOVE_STILL); if (m_objective == OBJECTIVE_HASSLE_CHAR) { - Say(SOUND_PED_COP_REACTION); - m_pedInObjective->Say(SOUND_PED_UNK_126); + Say(SOUND_PED_COP_ASK_FOR_ID); + m_pedInObjective->Say(SOUND_PED_INNOCENT); m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 3000; m_pedInObjective->m_leaveCarTimer = CTimer::GetTimeInMilliseconds() + 3000; SetObjective(OBJECTIVE_WANDER); diff --git a/src/peds/PedDebug.cpp b/src/peds/PedDebug.cpp index aed11357..0dbabb58 100644 --- a/src/peds/PedDebug.cpp +++ b/src/peds/PedDebug.cpp @@ -157,6 +157,9 @@ static char PersonalityTypeText[][18] = { "Old Girl", "Tough Girl", "Tramp", +#ifdef FIX_BUGS // there's male and female ones + "Tramp", +#endif "Tourist", "Prostitute", "Criminal", diff --git a/src/peds/PedFight.cpp b/src/peds/PedFight.cpp index 79e01211..9ea0ae4e 100644 --- a/src/peds/PedFight.cpp +++ b/src/peds/PedFight.cpp @@ -821,7 +821,7 @@ CPed::Attack(void) || weaponAnimAssoc->currentTime - weaponAnimAssoc->timeStep > delayBetweenAnimAndFire) { if (GetWeapon()->m_eWeaponType == WEAPONTYPE_CHAINSAW) { - DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_CHAINSAW_ATTACK, 0.0f); + DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_CHAINSAW_IDLE, 0.0f); } else if (weaponAnimTime <= delayBetweenAnimAndFire || weaponAnimTime - weaponAnimAssoc->timeStep > delayBetweenAnimAndFire || !weaponAnimAssoc->IsRunning()) { if (weaponAnimAssoc->speed < 1.0f) weaponAnimAssoc->speed = 1.0f; @@ -897,7 +897,7 @@ CPed::Attack(void) CPad::GetPad(0)->StartShake(240, 180); } } else { - DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_CHAINSAW_IDLE, 0.0f); + DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_CHAINSAW_ATTACK, 0.0f); if (IsPlayer()) { CPad::GetPad(0)->StartShake(240, 90); } diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp index 9c668cf4..65180ee5 100644 --- a/src/peds/PlayerPed.cpp +++ b/src/peds/PlayerPed.cpp @@ -1679,7 +1679,7 @@ CPlayerPed::ProcessControl(void) } } if (GetWeapon()->m_eWeaponType == WEAPONTYPE_CHAINSAW && m_nPedState != PED_ATTACK && !bInVehicle) { - DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_CHAINSAW_ATTACK, 0.0f); + DMAudio.PlayOneShot(m_audioEntityId, SOUND_WEAPON_CHAINSAW_IDLE, 0.0f); } if (m_nMoveState != PEDMOVE_RUN && m_nMoveState != PEDMOVE_SPRINT) |