Merge remote-tracking branch 'origin/master' into miami

# Conflicts:
#	src/render/Renderer.cpp
This commit is contained in:
Sergeanur
2020-05-06 19:32:57 +03:00
7 changed files with 25 additions and 24 deletions

View File

@ -2190,7 +2190,7 @@ CAutomobile::ProcessEntityCollision(CEntity *ent, CColPoint *colpoints)
}
// move body cast
if(phys->bIsStatic){
if(phys->IsStatic()){
phys->bIsStatic = false;
phys->m_nStaticFrames = 0;
phys->ApplyMoveForce(m_vecMoveSpeed / Sqrt(speed));