diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-11-13 13:20:07 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-11-13 13:20:07 +0300 |
| commit | a3f24d1bbfa976ab9dc64748d2e53c0e53b745b3 (patch) | |
| tree | 5434b00d364160eca70b29e5d37cc56fdb217d13 | |
| parent | 2e915780aa7be1570e2ee018daae8c97cbc3290e (diff) | |
| parent | 3d46f2a3af9f6a810cfbbfacc5921356ced6ea41 (diff) | |
Merge remote-tracking branch 'upstream/miami' into miami
| -rw-r--r-- | src/vehicles/Bike.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vehicles/Bike.cpp b/src/vehicles/Bike.cpp index b260c7d4..62633464 100644 --- a/src/vehicles/Bike.cpp +++ b/src/vehicles/Bike.cpp @@ -2110,7 +2110,7 @@ CBike::VehicleDamage(void) float total = fwd*Abs(DotProduct(m_vecDamageNormal, GetForward())) + 0.45f*Abs(DotProduct(m_vecDamageNormal, GetRight())) + up*Max(DotProduct(m_vecDamageNormal, GetUp()), 0.0f); - float damage = (total - 1.5f*Max(DotProduct(m_vecDamageNormal, GetUp()), 0.0f))*colSpeed; + float damage = (total - 1.5f*Min(DotProduct(m_vecDamageNormal, GetUp()), 0.0f))*colSpeed; if(pDriver->IsPlayer() && CCullZones::CamStairsForPlayer() && CCullZones::FindZoneWithStairsAttributeForPlayer()) damage = 0.0f; @@ -2658,13 +2658,13 @@ CBike::KnockOffRider(eWeaponType weapon, uint8 direction, CPed *ped, bool bGetBa case WEAPONTYPE_DROWNING:{ RwRGBA color; anim = ANIM_FALL_FALL; - ped->m_vecMoveSpeed *= 0.2f; + ped->m_vecMoveSpeed = m_vecMoveSpeed*0.2f; ped->m_vecMoveSpeed.z = 0.0f; ped->m_pCollidingEntity = this; color.red = (0.5f * CTimeCycle::GetDirectionalRed() + CTimeCycle::GetAmbientRed_Obj())*0.45f*255; color.green = (0.5f * CTimeCycle::GetDirectionalGreen() + CTimeCycle::GetAmbientGreen_Obj())*0.45f*255; color.blue = (0.5f * CTimeCycle::GetDirectionalBlue() + CTimeCycle::GetAmbientBlue_Obj())*0.45f*255; - color.alpha = CGeneral::GetRandomNumberInRange(0, 48) + 48; + color.alpha = CGeneral::GetRandomNumberInRange(48, 96); DMAudio.PlayOneShot(m_audioEntityId, SOUND_SPLASH, 0.0f); CVector splashPos = ped->GetPosition() + 2.2f*ped->m_vecMoveSpeed; float waterZ = 0.0f; |