diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-12 11:08:30 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-12 11:08:30 +0200 |
commit | cbb298c8dd0ff23007ba403157a47da1ddf134d5 (patch) | |
tree | 6f069af03c21d9af52cdcebd6fef7117454394d1 /src/vehicles | |
parent | Merge branch 'master' into garages_dev (diff) | |
parent | Merge pull request #402 from Nick007J/master (diff) | |
download | re3-cbb298c8dd0ff23007ba403157a47da1ddf134d5.tar re3-cbb298c8dd0ff23007ba403157a47da1ddf134d5.tar.gz re3-cbb298c8dd0ff23007ba403157a47da1ddf134d5.tar.bz2 re3-cbb298c8dd0ff23007ba403157a47da1ddf134d5.tar.lz re3-cbb298c8dd0ff23007ba403157a47da1ddf134d5.tar.xz re3-cbb298c8dd0ff23007ba403157a47da1ddf134d5.tar.zst re3-cbb298c8dd0ff23007ba403157a47da1ddf134d5.zip |
Diffstat (limited to 'src/vehicles')
-rw-r--r-- | src/vehicles/Automobile.cpp | 4 | ||||
-rw-r--r-- | src/vehicles/Boat.cpp | 2 | ||||
-rw-r--r-- | src/vehicles/Floater.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp index 13558920..d94428e5 100644 --- a/src/vehicles/Automobile.cpp +++ b/src/vehicles/Automobile.cpp @@ -2814,7 +2814,7 @@ CAutomobile::ProcessBuoyancy(void) CVector impulse, point; if(mod_Buoyancy.ProcessBuoyancy(this, m_fBuoyancy, &point, &impulse)){ - m_flagD8 = true; + bTouchingWater = true; ApplyMoveForce(impulse); ApplyTurnForce(impulse, point); @@ -2899,7 +2899,7 @@ CAutomobile::ProcessBuoyancy(void) } }else{ bIsInWater = false; - m_flagD8 = false; + bTouchingWater = false; static RwRGBA splashCol = {155, 155, 185, 196}; static RwRGBA smokeCol = {255, 255, 255, 255}; diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp index 9c7cbb4f..0b3dab3d 100644 --- a/src/vehicles/Boat.cpp +++ b/src/vehicles/Boat.cpp @@ -70,7 +70,7 @@ CBoat::CBoat(int mi, uint8 owner) : CVehicle(owner) unk1 = 0.0f; m_bIsAnchored = true; field_2C4 = -9999.99f; - m_flagD8 = true; + bTouchingWater = true; field_2CC = 0.0f; field_2D0 = 0; m_nNumWakePoints = 0; diff --git a/src/vehicles/Floater.cpp b/src/vehicles/Floater.cpp index 6b8bf755..62d55925 100644 --- a/src/vehicles/Floater.cpp +++ b/src/vehicles/Floater.cpp @@ -26,7 +26,7 @@ cBuoyancy::ProcessBuoyancy(CPhysical *phys, float buoyancy, CVector *point, CVec { m_numSteps = 2.0f; - if(!CWaterLevel::GetWaterLevel(phys->GetPosition(), &m_waterlevel, phys->m_flagD8)) + if(!CWaterLevel::GetWaterLevel(phys->GetPosition(), &m_waterlevel, phys->bTouchingWater)) return false; m_matrix = phys->GetMatrix(); |