summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Automobile.cpp
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-10-18 16:17:11 +0200
committerSergeanur <s.anureev@yandex.ua>2020-10-18 16:17:11 +0200
commit8697eebbc237ceb0ed0d395a8c22440b9a1c15b8 (patch)
treeed2b2d923a03196c639e6f897f404b1caec0772d /src/vehicles/Automobile.cpp
parentMerge remote-tracking branch 'origin/miami' into VC/Pickups (diff)
parentMerge branch 'master' into miami (diff)
downloadre3-8697eebbc237ceb0ed0d395a8c22440b9a1c15b8.tar
re3-8697eebbc237ceb0ed0d395a8c22440b9a1c15b8.tar.gz
re3-8697eebbc237ceb0ed0d395a8c22440b9a1c15b8.tar.bz2
re3-8697eebbc237ceb0ed0d395a8c22440b9a1c15b8.tar.lz
re3-8697eebbc237ceb0ed0d395a8c22440b9a1c15b8.tar.xz
re3-8697eebbc237ceb0ed0d395a8c22440b9a1c15b8.tar.zst
re3-8697eebbc237ceb0ed0d395a8c22440b9a1c15b8.zip
Diffstat (limited to 'src/vehicles/Automobile.cpp')
-rw-r--r--src/vehicles/Automobile.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index 1316985d..395f3917 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -1,4 +1,4 @@
-#include "common.h"
+#include "common.h"
#include "main.h"
#include "General.h"
@@ -4635,7 +4635,6 @@ CAutomobile::ProcessOpenDoor(uint32 component, uint32 anim, float time)
case ANIM_CAR_ROLLDOOR_LOW:
ProcessDoorOpenCloseAnimation(this, component, door, time, 0.1f, 0.6f, 0.95f);
break;
- break;
case ANIM_CAR_GETOUT_LHS:
case ANIM_CAR_GETOUT_LOW_LHS:
case ANIM_CAR_GETOUT_RHS:
@@ -4649,6 +4648,7 @@ CAutomobile::ProcessOpenDoor(uint32 component, uint32 anim, float time)
case ANIM_CAR_PULLOUT_RHS:
case ANIM_CAR_PULLOUT_LOW_RHS:
OpenDoor(component, door, 1.0f);
+ break;
case ANIM_COACH_OPEN_L:
case ANIM_COACH_OPEN_R:
ProcessDoorOpenAnimation(this, component, door, time, 0.66f, 0.8f);
@@ -5349,7 +5349,7 @@ CAutomobile::SpawnFlyingComponent(int32 component, uint32 type)
obj->m_fElasticity = 0.1f;
obj->m_fBuoyancy = obj->m_fMass*GRAVITY/0.75f;
obj->ObjectCreatedBy = TEMP_OBJECT;
- obj->bIsStatic = false;
+ obj->SetIsStatic(false);
obj->bIsPickup = false;
obj->bUseVehicleColours = true;
obj->m_colour1 = m_currentColour1;