diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-04-19 15:54:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-19 15:54:05 +0200 |
| commit | f9ed50e17813d2a6708a6516e18041c7482a7462 (patch) | |
| tree | e8d1312d1e2a9706793ac781271fedc73db91624 /src/entities/Physical.cpp | |
| parent | Fix savename buffer overflow (diff) | |
| parent | Struct cleanup, various fixes, enable PS2 rand (diff) | |
| download | re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.gz re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.bz2 re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.lz re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.xz re3-f9ed50e17813d2a6708a6516e18041c7482a7462.tar.zst re3-f9ed50e17813d2a6708a6516e18041c7482a7462.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/entities/Physical.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp index 445cd83f..ec4543f6 100644 --- a/src/entities/Physical.cpp +++ b/src/entities/Physical.cpp @@ -36,7 +36,7 @@ CPhysical::CPhysical(void) for(i = 0; i < 6; i++) m_aCollisionRecords[i] = nil; - field_EF = false; + m_bIsVehicleBeingShifted = false; m_nDamagePieceType = 0; m_fDamageImpulse = 0.0f; @@ -63,7 +63,7 @@ CPhysical::CPhysical(void) m_phy_flagA10 = false; m_phy_flagA20 = false; - m_nZoneLevel = 0; + m_nZoneLevel = LEVEL_NONE; } CPhysical::~CPhysical(void) @@ -1767,13 +1767,13 @@ CPhysical::ProcessShift(void) CWorld::AdvanceCurrentScanCode(); if(IsVehicle()) - field_EF = true; + m_bIsVehicleBeingShifted = true; CEntryInfoNode *node; bool hasshifted = false; // whatever that means... for(node = m_entryInfoList.first; node; node = node->next) hasshifted |= ProcessShiftSectorList(node->sector->m_lists); - field_EF = false; + m_bIsVehicleBeingShifted = false; if(hasshifted){ CWorld::AdvanceCurrentScanCode(); for(node = m_entryInfoList.first; node; node = node->next) @@ -1799,7 +1799,7 @@ CPhysical::ProcessCollision(void) CPed *ped = (CPed*)this; m_fDistanceTravelled = 0.0f; - field_EF = 0; + m_bIsVehicleBeingShifted = false; m_phy_flagA80 = false; if(!bUsesCollision){ @@ -1912,7 +1912,7 @@ CPhysical::ProcessCollision(void) ApplyMoveSpeed(); ApplyTurnSpeed(); GetMatrix().Reorthogonalise(); - field_EF = 0; + m_bIsVehicleBeingShifted = false; m_phy_flagA80 = false; if(!m_vecMoveSpeed.IsZero() || !m_vecTurnSpeed.IsZero() || |