summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Automobile.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-05-19 19:54:05 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-05-19 19:54:05 +0200
commit4c822e8375268ac34f92af3f1960965446d32506 (patch)
tree50c0d7d8c2514880f9148a2edc655954eb500191 /src/vehicles/Automobile.cpp
parentMerge remote-tracking branch 'upstream/miami' into miami (diff)
downloadre3-4c822e8375268ac34f92af3f1960965446d32506.tar
re3-4c822e8375268ac34f92af3f1960965446d32506.tar.gz
re3-4c822e8375268ac34f92af3f1960965446d32506.tar.bz2
re3-4c822e8375268ac34f92af3f1960965446d32506.tar.lz
re3-4c822e8375268ac34f92af3f1960965446d32506.tar.xz
re3-4c822e8375268ac34f92af3f1960965446d32506.tar.zst
re3-4c822e8375268ac34f92af3f1960965446d32506.zip
Diffstat (limited to '')
-rw-r--r--src/vehicles/Automobile.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index e0ee0296..524067ca 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -2853,6 +2853,7 @@ CAutomobile::ProcessBuoyancy(void)
if(impulseRatio > 0.5f){
bIsInWater = true;
+ bIsDrowning = true;
if(m_vecMoveSpeed.z < -0.1f)
m_vecMoveSpeed.z = -0.1f;
@@ -2867,8 +2868,11 @@ CAutomobile::ProcessBuoyancy(void)
if(pPassengers[i]->IsPlayer() || !bWaterTight)
pPassengers[i]->InflictDamage(nil, WEAPONTYPE_DROWNING, CTimer::GetTimeStep(), PEDPIECE_TORSO, 0);
}
- }else
+ }
+ else {
bIsInWater = false;
+ bIsDrowning = false;
+ }
static uint32 nGenerateRaindrops = 0;
static uint32 nGenerateWaterCircles = 0;
@@ -2950,6 +2954,7 @@ CAutomobile::ProcessBuoyancy(void)
}
}else{
bIsInWater = false;
+ bIsDrowning = false;
bTouchingWater = false;
static RwRGBA splashCol = {155, 155, 185, 196};