diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2021-07-12 09:32:01 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2021-07-12 09:32:01 +0200 |
| commit | 91d958bf2748b94acf370c7bc57b4ef061bcee2d (patch) | |
| tree | f9dcbdb25b9cf741b2cb280c2067990ae6c829cd /src/entities | |
| parent | small changes (diff) | |
| parent | Merge branch 'miami' into lcs (diff) | |
| download | re3-91d958bf2748b94acf370c7bc57b4ef061bcee2d.tar re3-91d958bf2748b94acf370c7bc57b4ef061bcee2d.tar.gz re3-91d958bf2748b94acf370c7bc57b4ef061bcee2d.tar.bz2 re3-91d958bf2748b94acf370c7bc57b4ef061bcee2d.tar.lz re3-91d958bf2748b94acf370c7bc57b4ef061bcee2d.tar.xz re3-91d958bf2748b94acf370c7bc57b4ef061bcee2d.tar.zst re3-91d958bf2748b94acf370c7bc57b4ef061bcee2d.zip | |
Diffstat (limited to 'src/entities')
| -rw-r--r-- | src/entities/Entity.cpp | 4 | ||||
| -rw-r--r-- | src/entities/Physical.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/entities/Entity.cpp b/src/entities/Entity.cpp index 83c65eeb..cd50923a 100644 --- a/src/entities/Entity.cpp +++ b/src/entities/Entity.cpp @@ -901,7 +901,7 @@ CEntity::SaveEntityFlags(uint8*& buf) if (bStreamingDontDelete) tmp |= BIT(30); if (bRemoveFromWorld) tmp |= BIT(31); - WriteSaveBuf<uint32>(buf, tmp); + WriteSaveBuf(buf, tmp); tmp = 0; @@ -922,7 +922,7 @@ CEntity::SaveEntityFlags(uint8*& buf) if (bUnderwater) tmp |= BIT(13); if (bHasPreRenderEffects) tmp |= BIT(14); - WriteSaveBuf<uint32>(buf, tmp); + WriteSaveBuf(buf, tmp); } void diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp index 69110a83..fd635b90 100644 --- a/src/entities/Physical.cpp +++ b/src/entities/Physical.cpp @@ -529,6 +529,10 @@ CPhysical::ApplySpringDampening(float damping, float dampingLimit, CVector &spri { float speedA = DotProduct(speed, springDir); float speedB = DotProduct(GetSpeed(point), springDir); +#ifdef FIX_BUGS + if (speedB == 0.0f) + return true; +#endif float step = Min(CTimer::GetTimeStep(), 3.0f); damping *= step; if(bIsHeavy) |