diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-04-12 11:05:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 11:05:49 +0200 |
| commit | c593599fc5e929ee80c1c0d4e825381a50b6fcd0 (patch) | |
| tree | 5ff49901ab93aa3546c5aa5314eaf1cea7c22c2e /src/peds | |
| parent | Merge pull request #388 from ShFil119/audio16 (diff) | |
| parent | CObject fixes (diff) | |
| download | re3-c593599fc5e929ee80c1c0d4e825381a50b6fcd0.tar re3-c593599fc5e929ee80c1c0d4e825381a50b6fcd0.tar.gz re3-c593599fc5e929ee80c1c0d4e825381a50b6fcd0.tar.bz2 re3-c593599fc5e929ee80c1c0d4e825381a50b6fcd0.tar.lz re3-c593599fc5e929ee80c1c0d4e825381a50b6fcd0.tar.xz re3-c593599fc5e929ee80c1c0d4e825381a50b6fcd0.tar.zst re3-c593599fc5e929ee80c1c0d4e825381a50b6fcd0.zip | |
Diffstat (limited to 'src/peds')
| -rw-r--r-- | src/peds/Ped.cpp | 4 | ||||
| -rw-r--r-- | src/peds/Population.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index 2cd942f9..687c9906 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -15027,7 +15027,7 @@ CPed::ProcessBuoyancy(void) #endif if (mod_Buoyancy.ProcessBuoyancy(this, GRAVITY * m_fMass * buoyancyLevel, &buoyancyPoint, &buoyancyImpulse)) { - m_flagD8 = true; + bTouchingWater = true; CEntity *entity; CColPoint point; if (CWorld::ProcessVerticalLine(GetPosition(), GetPosition().z - 3.0f, point, entity, false, true, false, false, false, false, false) @@ -15093,7 +15093,7 @@ CPed::ProcessBuoyancy(void) } else return; } else - m_flagD8 = false; + bTouchingWater = false; if (nGenerateWaterCircles && CTimer::GetTimeInMilliseconds() >= nGenerateWaterCircles) { CVector pos = GetPosition(); diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp index dbfd40c6..dfa61584 100644 --- a/src/peds/Population.cpp +++ b/src/peds/Population.cpp @@ -967,7 +967,7 @@ CPopulation::ConvertToRealObject(CDummyObject *dummy) } else if (obj->m_modelIndex == MI_BUOY) { obj->bIsStatic = false; obj->m_vecMoveSpeed = CVector(0.0f, 0.0f, -0.001f); - obj->m_flagD8 = true; + obj->bTouchingWater = true; obj->AddToMovingList(); } } |