mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-10-11 13:30:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/lcs' into lcs

Browse source
This commit is contained in:
Nikolay Korolev 2021-07-12 10:32:01 +03:00
commit 91d958bf27
35 changed files with 1343 additions and 441 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/entities/Entity.cpp
View file

@ -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

4
src/entities/Physical.cpp
View file

@ -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)