summaryrefslogtreecommitdiffstats
path: root/src/entities/Physical.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/entities/Physical.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/entities/Physical.cpp')
-rw-r--r--src/entities/Physical.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/entities/Physical.cpp b/src/entities/Physical.cpp
index e2099945..df3da822 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)
@@ -1771,13 +1771,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)
@@ -1803,7 +1803,7 @@ CPhysical::ProcessCollision(void)
CPed *ped = (CPed*)this;
m_fDistanceTravelled = 0.0f;
- field_EF = 0;
+ m_bIsVehicleBeingShifted = false;
m_phy_flagA80 = false;
if(!bUsesCollision){
@@ -1916,7 +1916,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() ||