summaryrefslogtreecommitdiffstats
path: root/src/vehicles
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-11-12 20:05:02 +0100
committeraap <aap@papnet.eu>2020-11-12 20:05:02 +0100
commit3d46f2a3af9f6a810cfbbfacc5921356ced6ea41 (patch)
tree2a3fc062728235aa64658763d34ab082592243ac /src/vehicles
parentMerge branch 'miami' of https://github.com/GTAmodding/re3 into miami (diff)
downloadre3-3d46f2a3af9f6a810cfbbfacc5921356ced6ea41.tar
re3-3d46f2a3af9f6a810cfbbfacc5921356ced6ea41.tar.gz
re3-3d46f2a3af9f6a810cfbbfacc5921356ced6ea41.tar.bz2
re3-3d46f2a3af9f6a810cfbbfacc5921356ced6ea41.tar.lz
re3-3d46f2a3af9f6a810cfbbfacc5921356ced6ea41.tar.xz
re3-3d46f2a3af9f6a810cfbbfacc5921356ced6ea41.tar.zst
re3-3d46f2a3af9f6a810cfbbfacc5921356ced6ea41.zip
Diffstat (limited to 'src/vehicles')
-rw-r--r--src/vehicles/Bike.cpp6
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;