mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-07-22 20:59:19 +02:00
Merge branch 'master-no-pull' into high-beam-lights
This commit is contained in:
24
Train.cpp
24
Train.cpp
@@ -7429,6 +7429,25 @@ bool TTrain::Update( double const Deltatime )
|
|||||||
btLampkaPoslizg.Turn( false );
|
btLampkaPoslizg.Turn( false );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Lampka pracujacej sprezacki
|
||||||
|
if (mvControlled->CompressorFlag || mvOccupied->CompressorFlag)
|
||||||
|
btCompressors.Turn(true);
|
||||||
|
else
|
||||||
|
btCompressors.Turn(false);
|
||||||
|
|
||||||
|
// Lampka aktywowanej kabiny
|
||||||
|
if (mvControlled->CabActive != 0) {
|
||||||
|
btCabActived.Turn(true);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
btCabActived.Turn(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mvControlled->Battery && mvControlled->CabActive == 0)
|
||||||
|
btAKLVents.Turn(true);
|
||||||
|
else
|
||||||
|
btAKLVents.Turn(true);
|
||||||
|
|
||||||
if( true == lowvoltagepower ) {
|
if( true == lowvoltagepower ) {
|
||||||
// McZapkie-141102: SHP i czuwak, TODO: sygnalizacja kabinowa
|
// McZapkie-141102: SHP i czuwak, TODO: sygnalizacja kabinowa
|
||||||
if( mvOccupied->SecuritySystem.is_vigilance_blinking() ) {
|
if( mvOccupied->SecuritySystem.is_vigilance_blinking() ) {
|
||||||
@@ -10141,7 +10160,10 @@ bool TTrain::initialize_button(cParser &Parser, std::string const &Label, int co
|
|||||||
{ "i-universal6:", btUniversals[ 6 ] },
|
{ "i-universal6:", btUniversals[ 6 ] },
|
||||||
{ "i-universal7:", btUniversals[ 7 ] },
|
{ "i-universal7:", btUniversals[ 7 ] },
|
||||||
{ "i-universal8:", btUniversals[ 8 ] },
|
{ "i-universal8:", btUniversals[ 8 ] },
|
||||||
{ "i-universal9:", btUniversals[ 9 ] }
|
{ "i-universal9:", btUniversals[ 9 ] },
|
||||||
|
{ "i-cabactived:", btCabActived },
|
||||||
|
{"i-aklvents:", btAKLVents},
|
||||||
|
{"i-compressorany:", btCompressors }
|
||||||
};
|
};
|
||||||
{
|
{
|
||||||
auto lookup = lights.find( Label );
|
auto lookup = lights.find( Label );
|
||||||
|
|||||||
3
Train.h
3
Train.h
@@ -774,6 +774,9 @@ public: // reszta może by?publiczna
|
|||||||
TButton btLampkaRearRightLight;
|
TButton btLampkaRearRightLight;
|
||||||
TButton btLampkaRearLeftEndLight;
|
TButton btLampkaRearLeftEndLight;
|
||||||
TButton btLampkaRearRightEndLight;
|
TButton btLampkaRearRightEndLight;
|
||||||
|
TButton btCabActived;
|
||||||
|
TButton btAKLVents;
|
||||||
|
TButton btCompressors; // lampka pracy jakiejkolwiek sprezarki
|
||||||
// other
|
// other
|
||||||
TButton btLampkaMalfunction;
|
TButton btLampkaMalfunction;
|
||||||
TButton btLampkaMalfunctionB;
|
TButton btLampkaMalfunctionB;
|
||||||
|
|||||||
Reference in New Issue
Block a user