diff options
author | aap <aap@papnet.eu> | 2019-07-09 09:57:44 +0200 |
---|---|---|
committer | aap <aap@papnet.eu> | 2019-07-09 09:57:44 +0200 |
commit | 74fcbc8c0a6bbac8e8057655c5f1133e15c63656 (patch) | |
tree | 75dabaa5dc285f1541c6ee058028c7f57095eecf /src/peds/Ped.cpp | |
parent | Merge branch 'master' of github.com:GTAmodding/re3 (diff) | |
download | re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.gz re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.bz2 re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.lz re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.xz re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.tar.zst re3-74fcbc8c0a6bbac8e8057655c5f1133e15c63656.zip |
Diffstat (limited to 'src/peds/Ped.cpp')
-rw-r--r-- | src/peds/Ped.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp index bf36d403..e0e0b913 100644 --- a/src/peds/Ped.cpp +++ b/src/peds/Ped.cpp @@ -10,6 +10,7 @@ #include "Ped.h" #include "PlayerPed.h" #include "General.h" +#include "SurfaceTable.h" #include "VisibilityPlugins.h" #include "AudioManager.h" #include "HandlingMgr.h" @@ -430,7 +431,7 @@ CPed::CPed(uint32 pedType) : m_pedIK(this) m_ped_flagI1 = false; m_ped_flagI2 = false; m_ped_flagI4 = false; - bRecordedForReplay = false; + bHasAlreadyBeenRecorded = false; m_ped_flagI10 = false; #ifdef KANGAROO_CHEAT m_ped_flagI80 = false; @@ -1772,12 +1773,12 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase) static void particleProduceFootDust(CPed *ped, CVector *pos, float size, int times) { - switch (ped->m_nLastCollType) + switch (ped->m_nSurfaceTouched) { - case 1: // somewhere hard - case 3: // soft dirt - case 5: // pavement - case 18:// sand + case SURFACE_TARMAC: + case SURFACE_DIRT: + case SURFACE_PAVEMENT: + case SURFACE_SAND: for (int i = 0; i < times; ++i) { CVector adjustedPos = *pos; adjustedPos.x += CGeneral::GetRandomNumberInRange(-0.1f, 0.1f); @@ -1879,7 +1880,7 @@ CPed::PlayFootSteps(void) } } - if (m_nLastCollType == 19) { // Water + if (m_nSurfaceTouched == SURFACE_PUDDLE) { float pedSpeed = CVector2D(m_vecMoveSpeed).Magnitude(); if (pedSpeed > 0.03f && CTimer::GetFrameCounter() % 2 == 0 && pedSpeed > 0.13f) { float particleSize = pedSpeed * 2.0f; |