summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Automobile.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-04-19 16:38:48 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2020-04-19 16:38:48 +0200
commitdf376a13ea8dac7ecff2aabe7d715774bcc7c294 (patch)
treedc4c0230c14bce31044813c8dc4048a837c0c278 /src/vehicles/Automobile.cpp
parent1.1 patch stuff (diff)
parentMerge pull request #474 from Nick007J/master (diff)
downloadre3-df376a13ea8dac7ecff2aabe7d715774bcc7c294.tar
re3-df376a13ea8dac7ecff2aabe7d715774bcc7c294.tar.gz
re3-df376a13ea8dac7ecff2aabe7d715774bcc7c294.tar.bz2
re3-df376a13ea8dac7ecff2aabe7d715774bcc7c294.tar.lz
re3-df376a13ea8dac7ecff2aabe7d715774bcc7c294.tar.xz
re3-df376a13ea8dac7ecff2aabe7d715774bcc7c294.tar.zst
re3-df376a13ea8dac7ecff2aabe7d715774bcc7c294.zip
Diffstat (limited to 'src/vehicles/Automobile.cpp')
-rw-r--r--src/vehicles/Automobile.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index c2a664a6..2d0aadcc 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -562,7 +562,7 @@ CAutomobile::ProcessControl(void)
bWasPostponed = false;
bHasHitWall = false;
m_fDistanceTravelled = 0.0f;
- field_EF = false;
+ m_bIsVehicleBeingShifted = false;
m_phy_flagA80 = false;
ApplyMoveSpeed();
ApplyTurnSpeed();
@@ -2148,7 +2148,7 @@ CAutomobile::ProcessEntityCollision(CEntity *ent, CColPoint *colpoints)
// m_aSuspensionSpringRatio are now set to the point where the tyre touches ground.
// In ProcessControl these will be re-normalized to ignore the tyre radius.
- if(field_EF || m_phy_flagA80 ||
+ if(m_bIsVehicleBeingShifted || m_phy_flagA80 ||
GetModelIndex() == MI_DODO && (ent->IsPed() || ent->IsVehicle())){
// don't do line collision
for(i = 0; i < 4; i++)