eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 11:19:19 +02:00
Code Issues 123 Wiki Activity

build 200604. sound loading logging enhancement, driving aid throttle data enhancement, external camera movement control fix

Browse Source
This commit is contained in:
tmj-fstate
2020-06-05 16:45:52 +02:00
parent ad1a14082c
commit 03561b11d8
9 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
driveruipanels.cpp
View File

@@ -88,9 +88,9 @@ drivingaid_panel::update() {
std::snprintf(
m_buffer.data(), m_buffer.size(),
locale::strings[ locale::string::driver_aid_throttle ].c_str(),
driver->Controlling()->MainCtrlPos,
driver->Controlling()->ScndCtrlPos,
( mover->DirActive > 0 ? 'D' : mover->DirActive < 0 ? 'R' : 'N' ),
( mover->EIMCtrlType > 0 ? std::max( 0, static_cast<int>( 100.4 * mover->eimic_real ) ) : driver->Controlling()->MainCtrlPos ),
( mover->EIMCtrlType > 0 ? driver->Controlling()->MainCtrlPos : driver->Controlling()->ScndCtrlPos ),
( mover->SpeedCtrlUnit.IsActive ? 'T' : mover->DirActive > 0 ? 'D' : mover->DirActive < 0 ? 'R' : 'N' ),
expandedtext.c_str());
text_lines.emplace_back( m_buffer.data(), Global.UITextColor );
@@ -106,10 +106,12 @@ drivingaid_panel::update() {
mover->PipePress * 100 );
expandedtext = m_buffer.data();
}
auto const basicbraking { mover->fBrakeCtrlPos };
auto const eimicbraking { std::max( 0.0, -100.0 * mover->eimic_real ) };
std::snprintf(
m_buffer.data(), m_buffer.size(),
locale::strings[ locale::string::driver_aid_brakes ].c_str(),
mover->fBrakeCtrlPos,
( mover->EIMCtrlType == 0 ? basicbraking : mover->EIMCtrlType == 3 ? ( mover->UniCtrlIntegratedBrakeCtrl ? eimicbraking : basicbraking ) : eimicbraking ),
mover->LocalBrakePosA * LocalBrakePosNo,
( mover->SlippingWheels ? '!' : ' ' ),
expandedtext.c_str() );