diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-23 00:43:17 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-23 00:43:17 +0200 |
commit | b9115b4429565f45c2391c02dd860f47166df6f8 (patch) | |
tree | 45963cc3390b1305b996e1eea2a1e953a217a82c /src/vehicles | |
parent | some fixes (diff) | |
parent | Merge pull request #578 from aap/miami (diff) | |
download | re3-b9115b4429565f45c2391c02dd860f47166df6f8.tar re3-b9115b4429565f45c2391c02dd860f47166df6f8.tar.gz re3-b9115b4429565f45c2391c02dd860f47166df6f8.tar.bz2 re3-b9115b4429565f45c2391c02dd860f47166df6f8.tar.lz re3-b9115b4429565f45c2391c02dd860f47166df6f8.tar.xz re3-b9115b4429565f45c2391c02dd860f47166df6f8.tar.zst re3-b9115b4429565f45c2391c02dd860f47166df6f8.zip |
Diffstat (limited to 'src/vehicles')
-rw-r--r-- | src/vehicles/Boat.cpp | 2 | ||||
-rw-r--r-- | src/vehicles/Vehicle.cpp | 3 | ||||
-rw-r--r-- | src/vehicles/Vehicle.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/vehicles/Boat.cpp b/src/vehicles/Boat.cpp index c4ac94a2..483aa562 100644 --- a/src/vehicles/Boat.cpp +++ b/src/vehicles/Boat.cpp @@ -83,7 +83,7 @@ CBoat::CBoat(int mi, uint8 owner) : CVehicle(owner) bIsInWater = true; - unk1 = 0.0f; + m_phys_unused1 = 0.0f; m_bIsAnchored = true; m_fOrientation = INVALID_ORIENTATION; bTouchingWater = true; diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp index cd85c3db..8d763300 100644 --- a/src/vehicles/Vehicle.cpp +++ b/src/vehicles/Vehicle.cpp @@ -130,6 +130,9 @@ CVehicle::CVehicle(uint8 CreatedBy) AutoPilot.m_bStayInCurrentLevel = false; AutoPilot.m_bIgnorePathfinding = false; AutoPilot.m_nSwitchDistance = 20; + +// TODO(MIAMI) + bRestingOnPhysical = false; } CVehicle::~CVehicle() diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index e07c2768..8673de8f 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -189,7 +189,7 @@ public: uint8 bIsDrowning : 1; // is vehicle occupants taking damage in water (i.e. vehicle is dead in water) uint8 bTyresDontBurst : 1; // If this is set the tyres are invincible uint8 bCreatedAsPoliceVehicle : 1;// True if this guy was created as a police vehicle (enforcer, policecar, miamivice car etc) - //uint8 bRestingOnPhysical : 1; // Dont go static cause car is sitting on a physical object that might get removed + uint8 bRestingOnPhysical : 1; // Dont go static cause car is sitting on a physical object that might get removed uint8 bParking : 1; //uint8 bCanPark : 1; |