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

improved recognition and handling of light emitting vehicles

Browse Source
This commit is contained in:
tmj-fstate
2017-11-01 03:25:54 +01:00
parent a700d36ea7
commit 3456fbd651
8 changed files with 155 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
World.cpp
View File

@@ -707,9 +707,9 @@ void TWorld::OnKeyDown(int cKey)
CouplNr = 0; // z [-1,1] zrobić [0,1]
int mask, set = 0; // Ra: [Shift]+[Ctrl]+[T] odpala mi jakąś idiotyczną zmianę tapety pulpitu :/
if (Global::shiftState) // z [Shift] zapalanie
set = mask = TMoverParameters::light::rearendsignals; // bez [Ctrl] założyć tabliczki
set = mask = light::rearendsignals; // bez [Ctrl] założyć tabliczki
else if (Global::ctrlState)
set = mask = ( TMoverParameters::light::redmarker_left | TMoverParameters::light::redmarker_right ); // z [Ctrl] zapalić światła czerwone
set = mask = ( light::redmarker_left | light::redmarker_right ); // z [Ctrl] zapalić światła czerwone
else
mask = 2 + 32 + 64; // wyłączanie ściąga wszystko
if (((vehicle->iLights[CouplNr]) & mask) != set)
@@ -1435,15 +1435,15 @@ TWorld::Update_UI() {
"; TC:"
+ to_string( vehicle->MoverParameters->TotalCurrent, 0 );
auto const frontcouplerhighvoltage =
to_string( vehicle->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.voltage, 0 )
to_string( vehicle->MoverParameters->Couplers[ side::front ].power_high.voltage, 0 )
+ "@"
+ to_string( vehicle->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.current, 0 );
+ to_string( vehicle->MoverParameters->Couplers[ side::front ].power_high.current, 0 );
auto const rearcouplerhighvoltage =
to_string( vehicle->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.voltage, 0 )
to_string( vehicle->MoverParameters->Couplers[ side::rear ].power_high.voltage, 0 )
+ "@"
+ to_string( vehicle->MoverParameters->Couplers[ TMoverParameters::side::rear ].power_high.current, 0 );
+ to_string( vehicle->MoverParameters->Couplers[ side::rear ].power_high.current, 0 );
uitextline2 += ", HV: ";
if( vehicle->MoverParameters->Couplers[ TMoverParameters::side::front ].power_high.local == false ) {
if( vehicle->MoverParameters->Couplers[ side::front ].power_high.local == false ) {
uitextline2 +=
"(" + frontcouplerhighvoltage + ")-"
+ ":F" + ( vehicle->DirectionGet() ? "<<" : ">>" ) + "R:"