diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-10-13 23:44:48 +0200 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-10-13 23:44:48 +0200 |
commit | f93285df7960b75f616d9bbdb364e113714151ee (patch) | |
tree | afa425c6f56716ff4d610e2ed9497996c1fe9d06 /src/vehicles | |
parent | copypaste error (diff) | |
parent | Merge pull request #243 from erorcun/erorcun (diff) | |
download | re3-f93285df7960b75f616d9bbdb364e113714151ee.tar re3-f93285df7960b75f616d9bbdb364e113714151ee.tar.gz re3-f93285df7960b75f616d9bbdb364e113714151ee.tar.bz2 re3-f93285df7960b75f616d9bbdb364e113714151ee.tar.lz re3-f93285df7960b75f616d9bbdb364e113714151ee.tar.xz re3-f93285df7960b75f616d9bbdb364e113714151ee.tar.zst re3-f93285df7960b75f616d9bbdb364e113714151ee.zip |
Diffstat (limited to 'src/vehicles')
-rw-r--r-- | src/vehicles/Floater.h | 2 | ||||
-rw-r--r-- | src/vehicles/Plane.cpp | 4 | ||||
-rw-r--r-- | src/vehicles/Vehicle.h | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/vehicles/Floater.h b/src/vehicles/Floater.h index 0a2ae809..4754a235 100644 --- a/src/vehicles/Floater.h +++ b/src/vehicles/Floater.h @@ -35,7 +35,7 @@ public: float m_volumeUnderWater; CVector m_impulsePoint; - bool ProcessBuoyancy(CPhysical *phys, float buoyancy, CVector *impulse, CVector *point); + bool ProcessBuoyancy(CPhysical *phys, float buoyancy, CVector *point, CVector *impulse); void PreCalcSetup(CPhysical *phys, float buoyancy); void SimpleCalcBuoyancy(void); float SimpleSumBuoyancyData(CVector &waterLevel, tWaterLevel waterPosition); diff --git a/src/vehicles/Plane.cpp b/src/vehicles/Plane.cpp index 40e0e5a7..29affdcb 100644 --- a/src/vehicles/Plane.cpp +++ b/src/vehicles/Plane.cpp @@ -898,9 +898,9 @@ CPlane::TestRocketCollision(CVector *rocketPos) CPlane *plane = (CPlane*)CPools::GetVehiclePool()->GetSlot(i); if(plane && #ifdef EXPLODING_AIRTRAIN - (plane->GetModelIndex() == MI_AIRTRAIN || plane->GetModelIndex() == MI_DODO) && + (plane->GetModelIndex() == MI_AIRTRAIN || plane->GetModelIndex() == MI_DEADDODO) && #else - plane->GetModelIndex() != MI_AIRTRAIN && plane->GetModelIndex() == MI_DODO && // strange check + plane->GetModelIndex() != MI_AIRTRAIN && plane->GetModelIndex() == MI_DEADDODO && // strange check #endif !plane->m_bHasBeenHit && (*rocketPos - plane->GetPosition()).Magnitude() < 25.0f){ plane->m_nFrameWhenHit = CTimer::GetFrameCounter(); diff --git a/src/vehicles/Vehicle.h b/src/vehicles/Vehicle.h index ffc2ca45..a30f9842 100644 --- a/src/vehicles/Vehicle.h +++ b/src/vehicles/Vehicle.h @@ -266,7 +266,6 @@ public: bool ShufflePassengersToMakeSpace(void); bool IsAlarmOn(void) { return m_nAlarmState != 0 && m_nAlarmState != -1; } - bool IsWrecked(void) { return m_status == STATUS_WRECKED; } CVehicleModelInfo* GetModelInfo() { return (CVehicleModelInfo*)CModelInfo::GetModelInfo(GetModelIndex()); } static bool &bWheelsOnlyCheat; |