summaryrefslogtreecommitdiffstats
path: root/src/entities/Physical.cpp
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2019-07-09 22:39:29 +0200
committerNikolay Korolev <nickvnuk@gmail.com>2019-07-09 22:39:29 +0200
commitca4c7d9a4b802940eee9bf0cf86c30120d2e5ca1 (patch)
tree22019f7aa3ed57061c581ae837b6f4f3751d3822 /src/entities/Physical.cpp
parentRunningScript: 1/12 (diff)
parentyet more CAutomobile (diff)
downloadre3-ca4c7d9a4b802940eee9bf0cf86c30120d2e5ca1.tar
re3-ca4c7d9a4b802940eee9bf0cf86c30120d2e5ca1.tar.gz
re3-ca4c7d9a4b802940eee9bf0cf86c30120d2e5ca1.tar.bz2
re3-ca4c7d9a4b802940eee9bf0cf86c30120d2e5ca1.tar.lz
re3-ca4c7d9a4b802940eee9bf0cf86c30120d2e5ca1.tar.xz
re3-ca4c7d9a4b802940eee9bf0cf86c30120d2e5ca1.tar.zst
re3-ca4c7d9a4b802940eee9bf0cf86c30120d2e5ca1.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 b2512ec2..88287e26 100644
--- a/src/entities/Physical.cpp
+++ b/src/entities/Physical.cpp
@@ -62,7 +62,7 @@ CPhysical::CPhysical(void)
m_phy_flagA10 = false;
m_phy_flagA20 = false;
- m_nLastCollType = 0;
+ m_nSurfaceTouched = SURFACE_DEFAULT;
}
CPhysical::~CPhysical(void)
@@ -457,7 +457,7 @@ CPhysical::ApplySpringCollision(float springConst, CVector &springDir, CVector &
float compression = 1.0f - springRatio;
if(compression > 0.0f){
float step = min(CTimer::GetTimeStep(), 3.0f);
- float impulse = -0.008f*m_fMass*step * springConst * compression * bias*2.0f;
+ float impulse = -GRAVITY*m_fMass*step * springConst * compression * bias*2.0f;
ApplyMoveForce(springDir*impulse);
ApplyTurnForce(springDir*impulse, point);
}
@@ -489,7 +489,7 @@ void
CPhysical::ApplyGravity(void)
{
if(bAffectedByGravity)
- m_vecMoveSpeed.z -= 0.008f * CTimer::GetTimeStep();
+ m_vecMoveSpeed.z -= GRAVITY * CTimer::GetTimeStep();
}
void
@@ -1783,7 +1783,7 @@ CPhysical::ProcessShift(void)
}
bIsStuck = false;
bIsInSafePosition = true;
- m_fDistanceTravelled = (GetPosition() - *matrix.GetPosition()).Magnitude();
+ m_fDistanceTravelled = (GetPosition() - matrix.GetPosition()).Magnitude();
RemoveAndAdd();
}
}
@@ -1918,14 +1918,14 @@ CPhysical::ProcessCollision(void)
bHitByTrain ||
m_status == STATUS_PLAYER || IsPed() && ped->IsPlayer()){
if(IsVehicle())
- ((CVehicle*)this)->m_veh_flagD4 = true;
+ ((CVehicle*)this)->bVehicleColProcessed = true;
if(CheckCollision()){
GetMatrix() = savedMatrix;
return;
}
}
bHitByTrain = false;
- m_fDistanceTravelled = (GetPosition() - *savedMatrix.GetPosition()).Magnitude();
+ m_fDistanceTravelled = (GetPosition() - savedMatrix.GetPosition()).Magnitude();
m_phy_flagA80 = false;
bIsStuck = false;