summaryrefslogtreecommitdiffstats
path: root/src/vehicles/Vehicle.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-05-10 20:51:29 +0200
committeraap <aap@papnet.eu>2020-05-10 20:51:29 +0200
commit9e842f1628c273d20fb8221e8b42198880b127fe (patch)
treea9e71674dcd33c80f54bb22b1abf482a550cb4a2 /src/vehicles/Vehicle.cpp
parentforce load weapons as long as we dont stream em yet (diff)
downloadre3-9e842f1628c273d20fb8221e8b42198880b127fe.tar
re3-9e842f1628c273d20fb8221e8b42198880b127fe.tar.gz
re3-9e842f1628c273d20fb8221e8b42198880b127fe.tar.bz2
re3-9e842f1628c273d20fb8221e8b42198880b127fe.tar.lz
re3-9e842f1628c273d20fb8221e8b42198880b127fe.tar.xz
re3-9e842f1628c273d20fb8221e8b42198880b127fe.tar.zst
re3-9e842f1628c273d20fb8221e8b42198880b127fe.zip
Diffstat (limited to 'src/vehicles/Vehicle.cpp')
-rw-r--r--src/vehicles/Vehicle.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/vehicles/Vehicle.cpp b/src/vehicles/Vehicle.cpp
index d0341058..b6045062 100644
--- a/src/vehicles/Vehicle.cpp
+++ b/src/vehicles/Vehicle.cpp
@@ -423,17 +423,16 @@ CVehicle::FlyingControl(eFlightModel flightModel)
}
else {
fPitch = CPad::GetPad(0)->GetSteeringUpDown() / 128.0f;
- fRoll = CPad::GetPad(0)->GetLookLeft();
- if (CPad::GetPad(0)->GetLookRight())
- fRoll = -1.0f;
- fYaw = CPad::GetPad(0)->GetSteeringLeftRight() / 128.0f;
+ fYaw = CPad::GetPad(0)->GetLookRight();
+ if (CPad::GetPad(0)->GetLookLeft())
+ fYaw = -1.0f;
+ fRoll = -CPad::GetPad(0)->GetSteeringLeftRight() / 128.0f;
}
if (CPad::GetPad(0)->GetHorn()) {
fYaw = 0.0f;
fPitch = clamp(10.0f * DotProduct(m_vecMoveSpeed, GetUp()), -200.0f, 1.3f);
fRoll = clamp(10.0f * DotProduct(m_vecMoveSpeed, GetRight()), -200.0f, 1.3f);
}
- debug("fPitch: %f\n", fPitch);
ApplyTurnForce(fPitch * GetUp() * fPitchVar * m_fTurnMass * CTimer::GetTimeStep(), GetForward());
ApplyTurnForce(fRoll * GetUp() * fRollVar * m_fTurnMass * CTimer::GetTimeStep(), GetRight());
ApplyTurnForce(fYaw * GetForward() * fYawVar * m_fTurnMass * CTimer::GetTimeStep(), GetRight());