mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-07-23 16:49:18 +02:00
auxiliary vehicle lights, minor bug fixes
This commit is contained in:
185
DynObj.cpp
185
DynObj.cpp
@@ -974,11 +974,11 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist)
|
|||||||
// else btCPass2.TurnOff();
|
// else btCPass2.TurnOff();
|
||||||
if (MoverParameters->Power24vIsAvailable || MoverParameters->Power110vIsAvailable)
|
if (MoverParameters->Power24vIsAvailable || MoverParameters->Power110vIsAvailable)
|
||||||
{ // sygnaly konca pociagu
|
{ // sygnaly konca pociagu
|
||||||
if (btEndSignals1.Active())
|
if (m_endsignals1.Active())
|
||||||
{
|
{
|
||||||
if (TestFlag(MoverParameters->iLights[0], 2) || TestFlag(MoverParameters->iLights[0], 32))
|
if (TestFlag(MoverParameters->iLights[0], 2) || TestFlag(MoverParameters->iLights[0], 32))
|
||||||
{
|
{
|
||||||
btEndSignals1.Turn( true );
|
m_endsignals1.Turn( true );
|
||||||
btnOn = true;
|
btnOn = true;
|
||||||
}
|
}
|
||||||
// else btEndSignals1.TurnOff();
|
// else btEndSignals1.TurnOff();
|
||||||
@@ -987,22 +987,22 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist)
|
|||||||
{
|
{
|
||||||
if (TestFlag(MoverParameters->iLights[0], 2))
|
if (TestFlag(MoverParameters->iLights[0], 2))
|
||||||
{
|
{
|
||||||
btEndSignals11.Turn( true );
|
m_endsignal13.Turn( true );
|
||||||
btnOn = true;
|
btnOn = true;
|
||||||
}
|
}
|
||||||
// else btEndSignals11.TurnOff();
|
// else btEndSignals11.TurnOff();
|
||||||
if (TestFlag(MoverParameters->iLights[0], 32))
|
if (TestFlag(MoverParameters->iLights[0], 32))
|
||||||
{
|
{
|
||||||
btEndSignals13.Turn( true );
|
m_endsignal12.Turn( true );
|
||||||
btnOn = true;
|
btnOn = true;
|
||||||
}
|
}
|
||||||
// else btEndSignals13.TurnOff();
|
// else btEndSignals13.TurnOff();
|
||||||
}
|
}
|
||||||
if (btEndSignals2.Active())
|
if (m_endsignals2.Active())
|
||||||
{
|
{
|
||||||
if (TestFlag(MoverParameters->iLights[1], 2) || TestFlag(MoverParameters->iLights[1], 32))
|
if (TestFlag(MoverParameters->iLights[1], 2) || TestFlag(MoverParameters->iLights[1], 32))
|
||||||
{
|
{
|
||||||
btEndSignals2.Turn( true );
|
m_endsignals2.Turn( true );
|
||||||
btnOn = true;
|
btnOn = true;
|
||||||
}
|
}
|
||||||
// else btEndSignals2.TurnOff();
|
// else btEndSignals2.TurnOff();
|
||||||
@@ -1011,13 +1011,13 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist)
|
|||||||
{
|
{
|
||||||
if (TestFlag(MoverParameters->iLights[1], 2))
|
if (TestFlag(MoverParameters->iLights[1], 2))
|
||||||
{
|
{
|
||||||
btEndSignals21.Turn( true );
|
m_endsignal23.Turn( true );
|
||||||
btnOn = true;
|
btnOn = true;
|
||||||
}
|
}
|
||||||
// else btEndSignals21.TurnOff();
|
// else btEndSignals21.TurnOff();
|
||||||
if (TestFlag(MoverParameters->iLights[1], 32))
|
if (TestFlag(MoverParameters->iLights[1], 32))
|
||||||
{
|
{
|
||||||
btEndSignals23.Turn( true );
|
m_endsignal22.Turn( true );
|
||||||
btnOn = true;
|
btnOn = true;
|
||||||
}
|
}
|
||||||
// else btEndSignals23.TurnOff();
|
// else btEndSignals23.TurnOff();
|
||||||
@@ -1026,13 +1026,13 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist)
|
|||||||
// tablice blaszane:
|
// tablice blaszane:
|
||||||
if (TestFlag(MoverParameters->iLights[end::front], light::rearendsignals))
|
if (TestFlag(MoverParameters->iLights[end::front], light::rearendsignals))
|
||||||
{
|
{
|
||||||
btEndSignalsTab1.Turn( true );
|
m_endtab1.Turn( true );
|
||||||
btnOn = true;
|
btnOn = true;
|
||||||
}
|
}
|
||||||
// else btEndSignalsTab1.TurnOff();
|
// else btEndSignalsTab1.TurnOff();
|
||||||
if (TestFlag(MoverParameters->iLights[end::rear], light::rearendsignals))
|
if (TestFlag(MoverParameters->iLights[end::rear], light::rearendsignals))
|
||||||
{
|
{
|
||||||
btEndSignalsTab2.Turn( true );
|
m_endtab2.Turn( true );
|
||||||
btnOn = true;
|
btnOn = true;
|
||||||
}
|
}
|
||||||
// destination signs
|
// destination signs
|
||||||
@@ -1079,30 +1079,30 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist)
|
|||||||
if (TestFlag(MoverParameters->iLights[end::front], light::headlight_left))
|
if (TestFlag(MoverParameters->iLights[end::front], light::headlight_left))
|
||||||
{
|
{
|
||||||
if( DimHeadlights ) {
|
if( DimHeadlights ) {
|
||||||
btHeadSignals11.TurnxOnWithOnAsFallback();
|
m_headlamp13.TurnxOnWithOnAsFallback();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
btHeadSignals11.TurnOn();
|
m_headlamp13.TurnOn();
|
||||||
}
|
}
|
||||||
btnOn = true;
|
btnOn = true;
|
||||||
}
|
}
|
||||||
if (TestFlag(MoverParameters->iLights[end::front], light::headlight_upper))
|
if (TestFlag(MoverParameters->iLights[end::front], light::headlight_upper))
|
||||||
{
|
{
|
||||||
if( DimHeadlights ) {
|
if( DimHeadlights ) {
|
||||||
btHeadSignals12.TurnxOnWithOnAsFallback();
|
m_headlamp11.TurnxOnWithOnAsFallback();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
btHeadSignals12.TurnOn();
|
m_headlamp11.TurnOn();
|
||||||
}
|
}
|
||||||
btnOn = true;
|
btnOn = true;
|
||||||
}
|
}
|
||||||
if (TestFlag(MoverParameters->iLights[end::front], light::headlight_right))
|
if (TestFlag(MoverParameters->iLights[end::front], light::headlight_right))
|
||||||
{
|
{
|
||||||
if( DimHeadlights ) {
|
if( DimHeadlights ) {
|
||||||
btHeadSignals13.TurnxOnWithOnAsFallback();
|
m_headlamp12.TurnxOnWithOnAsFallback();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
btHeadSignals13.TurnOn();
|
m_headlamp12.TurnOn();
|
||||||
}
|
}
|
||||||
btnOn = true;
|
btnOn = true;
|
||||||
}
|
}
|
||||||
@@ -1110,30 +1110,71 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist)
|
|||||||
if (TestFlag(MoverParameters->iLights[end::rear], light::headlight_left))
|
if (TestFlag(MoverParameters->iLights[end::rear], light::headlight_left))
|
||||||
{
|
{
|
||||||
if( DimHeadlights ) {
|
if( DimHeadlights ) {
|
||||||
btHeadSignals21.TurnxOnWithOnAsFallback();
|
m_headlamp23.TurnxOnWithOnAsFallback();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
btHeadSignals21.TurnOn();
|
m_headlamp23.TurnOn();
|
||||||
}
|
}
|
||||||
btnOn = true;
|
btnOn = true;
|
||||||
}
|
}
|
||||||
if (TestFlag(MoverParameters->iLights[end::rear], light::headlight_upper))
|
if (TestFlag(MoverParameters->iLights[end::rear], light::headlight_upper))
|
||||||
{
|
{
|
||||||
if( DimHeadlights ) {
|
if( DimHeadlights ) {
|
||||||
btHeadSignals22.TurnxOnWithOnAsFallback();
|
m_headlamp21.TurnxOnWithOnAsFallback();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
btHeadSignals22.TurnOn();
|
m_headlamp21.TurnOn();
|
||||||
}
|
}
|
||||||
btnOn = true;
|
btnOn = true;
|
||||||
}
|
}
|
||||||
if (TestFlag(MoverParameters->iLights[end::rear], light::headlight_right))
|
if (TestFlag(MoverParameters->iLights[end::rear], light::headlight_right))
|
||||||
{
|
{
|
||||||
if( DimHeadlights ) {
|
if( DimHeadlights ) {
|
||||||
btHeadSignals23.TurnxOnWithOnAsFallback();
|
m_headlamp22.TurnxOnWithOnAsFallback();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
btHeadSignals23.TurnOn();
|
m_headlamp22.TurnOn();
|
||||||
|
}
|
||||||
|
btnOn = true;
|
||||||
|
}
|
||||||
|
// auxiliary lights
|
||||||
|
if (TestFlag(MoverParameters->iLights[end::front], light::auxiliary_left))
|
||||||
|
{
|
||||||
|
if( DimHeadlights ) {
|
||||||
|
m_headsignal13.TurnxOnWithOnAsFallback();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
m_headsignal13.TurnOn();
|
||||||
|
}
|
||||||
|
btnOn = true;
|
||||||
|
}
|
||||||
|
if (TestFlag(MoverParameters->iLights[end::front], light::auxiliary_right))
|
||||||
|
{
|
||||||
|
if( DimHeadlights ) {
|
||||||
|
m_headsignal12.TurnxOnWithOnAsFallback();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
m_headsignal12.TurnOn();
|
||||||
|
}
|
||||||
|
btnOn = true;
|
||||||
|
}
|
||||||
|
if (TestFlag(MoverParameters->iLights[end::rear], light::auxiliary_left))
|
||||||
|
{
|
||||||
|
if( DimHeadlights ) {
|
||||||
|
m_headsignal23.TurnxOnWithOnAsFallback();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
m_headsignal23.TurnOn();
|
||||||
|
}
|
||||||
|
btnOn = true;
|
||||||
|
}
|
||||||
|
if (TestFlag(MoverParameters->iLights[end::rear], light::auxiliary_right))
|
||||||
|
{
|
||||||
|
if( DimHeadlights ) {
|
||||||
|
m_headlamp22.TurnxOnWithOnAsFallback();
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
m_headlamp22.TurnOn();
|
||||||
}
|
}
|
||||||
btnOn = true;
|
btnOn = true;
|
||||||
}
|
}
|
||||||
@@ -2131,37 +2172,43 @@ TDynamicObject::Init(std::string Name, // nazwa pojazdu, np. "EU07-424"
|
|||||||
btCPass1.Init( "cpass1", mdModel, false);
|
btCPass1.Init( "cpass1", mdModel, false);
|
||||||
btCPass2.Init( "cpass2", mdModel, false);
|
btCPass2.Init( "cpass2", mdModel, false);
|
||||||
// sygnaly
|
// sygnaly
|
||||||
// ABu 060205: Zmiany dla koncowek swiecacych:
|
m_endsignal12.Init( "endsignal12", mdModel, false );
|
||||||
btEndSignals11.Init( "endsignal13", mdModel, false);
|
m_endsignal13.Init( "endsignal13", mdModel, false );
|
||||||
btEndSignals21.Init( "endsignal23", mdModel, false);
|
m_endsignal22.Init( "endsignal22", mdModel, false );
|
||||||
btEndSignals13.Init( "endsignal12", mdModel, false);
|
m_endsignal23.Init( "endsignal23", mdModel, false );
|
||||||
btEndSignals23.Init( "endsignal22", mdModel, false);
|
m_endsignals1.Init( "endsignals1", mdModel, false );
|
||||||
iInventory[ end::front ] |= btEndSignals11.Active() ? light::redmarker_left : 0; // informacja, czy ma poszczególne światła
|
m_endsignals2.Init( "endsignals2", mdModel, false );
|
||||||
iInventory[ end::front ] |= btEndSignals13.Active() ? light::redmarker_right : 0;
|
m_endtab1.Init( "endtab1", mdModel, false );
|
||||||
iInventory[ end::rear ] |= btEndSignals21.Active() ? light::redmarker_left : 0;
|
m_endtab2.Init( "endtab2", mdModel, false );
|
||||||
iInventory[ end::rear ] |= btEndSignals23.Active() ? light::redmarker_right : 0;
|
m_headlamp11.Init( "headlamp11", mdModel ); // górne
|
||||||
// ABu: to niestety zostawione dla kompatybilnosci modeli:
|
m_headlamp12.Init( "headlamp12", mdModel ); // prawe
|
||||||
btEndSignals1.Init( "endsignals1", mdModel, false);
|
m_headlamp13.Init( "headlamp13", mdModel ); // lewe
|
||||||
btEndSignals2.Init( "endsignals2", mdModel, false);
|
m_headlamp21.Init( "headlamp21", mdModel );
|
||||||
btEndSignalsTab1.Init( "endtab1", mdModel, false);
|
m_headlamp22.Init( "headlamp22", mdModel );
|
||||||
btEndSignalsTab2.Init( "endtab2", mdModel, false);
|
m_headlamp23.Init( "headlamp23", mdModel );
|
||||||
iInventory[ end::front ] |= btEndSignals1.Active() ? ( light::redmarker_left | light::redmarker_right ) : 0;
|
m_headsignal12.Init( "headsignal12", mdModel );
|
||||||
iInventory[ end::front ] |= btEndSignalsTab1.Active() ? light::rearendsignals : 0; // tabliczki blaszane
|
m_headsignal13.Init( "headsignal13", mdModel );
|
||||||
iInventory[ end::rear ] |= btEndSignals2.Active() ? ( light::redmarker_left | light::redmarker_right ) : 0;
|
m_headsignal22.Init( "headsignal22", mdModel );
|
||||||
iInventory[ end::rear ] |= btEndSignalsTab2.Active() ? light::rearendsignals : 0;
|
m_headsignal23.Init( "headsignal23", mdModel );
|
||||||
// ABu Uwaga! tu zmienic w modelu!
|
// informacja, czy ma poszczególne światła
|
||||||
btHeadSignals11.Init( "headlamp13", mdModel); // lewe
|
iInventory[ end::front ] |= m_endsignal12.Active() ? light::redmarker_right : 0;
|
||||||
btHeadSignals12.Init( "headlamp11", mdModel); // górne
|
iInventory[ end::front ] |= m_endsignal13.Active() ? light::redmarker_left : 0;
|
||||||
btHeadSignals13.Init( "headlamp12", mdModel); // prawe
|
iInventory[ end::rear ] |= m_endsignal22.Active() ? light::redmarker_right : 0;
|
||||||
btHeadSignals21.Init( "headlamp23", mdModel);
|
iInventory[ end::rear ] |= m_endsignal23.Active() ? light::redmarker_left : 0;
|
||||||
btHeadSignals22.Init( "headlamp21", mdModel);
|
iInventory[ end::front ] |= m_endsignals1.Active() ? ( light::redmarker_left | light::redmarker_right ) : 0;
|
||||||
btHeadSignals23.Init( "headlamp22", mdModel);
|
iInventory[ end::rear ] |= m_endsignals2.Active() ? ( light::redmarker_left | light::redmarker_right ) : 0;
|
||||||
iInventory[ end::front ] |= btHeadSignals11.Active() ? light::headlight_left : 0;
|
iInventory[ end::front ] |= m_endtab1.Active() ? light::rearendsignals : 0; // tabliczki blaszane
|
||||||
iInventory[ end::front ] |= btHeadSignals12.Active() ? light::headlight_upper : 0;
|
iInventory[ end::rear ] |= m_endtab2.Active() ? light::rearendsignals : 0;
|
||||||
iInventory[ end::front ] |= btHeadSignals13.Active() ? light::headlight_right : 0;
|
iInventory[ end::front ] |= m_headlamp11.Active() ? light::headlight_upper : 0;
|
||||||
iInventory[ end::rear ] |= btHeadSignals21.Active() ? light::headlight_left : 0;
|
iInventory[ end::front ] |= m_headlamp12.Active() ? light::headlight_right : 0;
|
||||||
iInventory[ end::rear ] |= btHeadSignals22.Active() ? light::headlight_upper : 0;
|
iInventory[ end::front ] |= m_headlamp13.Active() ? light::headlight_left : 0;
|
||||||
iInventory[ end::rear ] |= btHeadSignals23.Active() ? light::headlight_right : 0;
|
iInventory[ end::rear ] |= m_headlamp21.Active() ? light::headlight_upper : 0;
|
||||||
|
iInventory[ end::rear ] |= m_headlamp22.Active() ? light::headlight_right : 0;
|
||||||
|
iInventory[ end::rear ] |= m_headlamp23.Active() ? light::headlight_left : 0;
|
||||||
|
iInventory[ end::front ] |= m_headsignal12.Active() ? light::auxiliary_right : 0;
|
||||||
|
iInventory[ end::front ] |= m_headsignal13.Active() ? light::auxiliary_left : 0;
|
||||||
|
iInventory[ end::rear ] |= m_headsignal22.Active() ? light::auxiliary_right : 0;
|
||||||
|
iInventory[ end::rear ] |= m_headsignal23.Active() ? light::auxiliary_left : 0;
|
||||||
btMechanik1.Init( "mechanik1", mdLowPolyInt, false);
|
btMechanik1.Init( "mechanik1", mdLowPolyInt, false);
|
||||||
btMechanik2.Init( "mechanik2", mdLowPolyInt, false);
|
btMechanik2.Init( "mechanik2", mdLowPolyInt, false);
|
||||||
if( MoverParameters->dizel_heat.water.config.shutters ) {
|
if( MoverParameters->dizel_heat.water.config.shutters ) {
|
||||||
@@ -3982,20 +4029,24 @@ void TDynamicObject::TurnOff()
|
|||||||
btCCtrl2.Turn( false );
|
btCCtrl2.Turn( false );
|
||||||
btCPass1.Turn( false );
|
btCPass1.Turn( false );
|
||||||
btCPass2.Turn( false );
|
btCPass2.Turn( false );
|
||||||
btEndSignals11.Turn( false );
|
m_endsignal12.Turn( false );
|
||||||
btEndSignals13.Turn( false );
|
m_endsignal13.Turn( false );
|
||||||
btEndSignals21.Turn( false );
|
m_endsignal22.Turn( false );
|
||||||
btEndSignals23.Turn( false );
|
m_endsignal23.Turn( false );
|
||||||
btEndSignals1.Turn( false );
|
m_endsignals1.Turn( false );
|
||||||
btEndSignals2.Turn( false );
|
m_endsignals2.Turn( false );
|
||||||
btEndSignalsTab1.Turn( false );
|
m_endtab1.Turn( false );
|
||||||
btEndSignalsTab2.Turn( false );
|
m_endtab2.Turn( false );
|
||||||
btHeadSignals11.TurnOff();
|
m_headlamp11.TurnOff();
|
||||||
btHeadSignals12.TurnOff();
|
m_headlamp12.TurnOff();
|
||||||
btHeadSignals13.TurnOff();
|
m_headlamp13.TurnOff();
|
||||||
btHeadSignals21.TurnOff();
|
m_headlamp21.TurnOff();
|
||||||
btHeadSignals22.TurnOff();
|
m_headlamp22.TurnOff();
|
||||||
btHeadSignals23.TurnOff();
|
m_headlamp23.TurnOff();
|
||||||
|
m_headsignal12.TurnOff();
|
||||||
|
m_headsignal13.TurnOff();
|
||||||
|
m_headsignal22.TurnOff();
|
||||||
|
m_headsignal23.TurnOff();
|
||||||
btMechanik1.Turn( false );
|
btMechanik1.Turn( false );
|
||||||
btMechanik2.Turn( false );
|
btMechanik2.Turn( false );
|
||||||
btShutters1.Turn( false );
|
btShutters1.Turn( false );
|
||||||
|
|||||||
34
DynObj.h
34
DynObj.h
@@ -412,21 +412,25 @@ private:
|
|||||||
TButton btCPass2;
|
TButton btCPass2;
|
||||||
char cp1, sp1, cp2, sp2; // ustawienia węży
|
char cp1, sp1, cp2, sp2; // ustawienia węży
|
||||||
|
|
||||||
TButton btEndSignals11; // sygnalu konca pociagu
|
TButton m_endsignal12; // sygnalu konca pociagu
|
||||||
TButton btEndSignals13;
|
TButton m_endsignal13;
|
||||||
TButton btEndSignals21;
|
TButton m_endsignal22;
|
||||||
TButton btEndSignals23;
|
TButton m_endsignal23;
|
||||||
TButton btEndSignals1; // zeby bylo kompatybilne ze starymi modelami...
|
TButton m_endsignals1; // zeby bylo kompatybilne ze starymi modelami...
|
||||||
TButton btEndSignals2;
|
TButton m_endsignals2;
|
||||||
TButton btEndSignalsTab1; // sygnaly konca pociagu (blachy)
|
TButton m_endtab1; // sygnaly konca pociagu (blachy)
|
||||||
TButton btEndSignalsTab2;
|
TButton m_endtab2;
|
||||||
TAirCoupler btHeadSignals11; // oswietlenie czolowe - przod
|
TAirCoupler m_headlamp11; // oswietlenie czolowe - przod
|
||||||
TAirCoupler btHeadSignals12;
|
TAirCoupler m_headlamp12;
|
||||||
TAirCoupler btHeadSignals13;
|
TAirCoupler m_headlamp13;
|
||||||
TAirCoupler btHeadSignals21; // oswietlenie czolowe - tyl
|
TAirCoupler m_headlamp21; // oswietlenie czolowe - tyl
|
||||||
TAirCoupler btHeadSignals22;
|
TAirCoupler m_headlamp22;
|
||||||
TAirCoupler btHeadSignals23;
|
TAirCoupler m_headlamp23;
|
||||||
TButton btMechanik1;
|
TAirCoupler m_headsignal12;
|
||||||
|
TAirCoupler m_headsignal13;
|
||||||
|
TAirCoupler m_headsignal22;
|
||||||
|
TAirCoupler m_headsignal23;
|
||||||
|
TButton btMechanik1;
|
||||||
TButton btMechanik2;
|
TButton btMechanik2;
|
||||||
TButton btShutters1; // cooling shutters for primary water circuit
|
TButton btShutters1; // cooling shutters for primary water circuit
|
||||||
TButton btShutters2; // cooling shutters for auxiliary water circuit
|
TButton btShutters2; // cooling shutters for auxiliary water circuit
|
||||||
|
|||||||
@@ -194,12 +194,15 @@ enum class start_t {
|
|||||||
// recognized vehicle light locations and types; can be combined
|
// recognized vehicle light locations and types; can be combined
|
||||||
enum light {
|
enum light {
|
||||||
|
|
||||||
headlight_left = 0x01,
|
headlight_left = ( 1 << 0 ),
|
||||||
redmarker_left = 0x02,
|
redmarker_left = ( 1 << 1 ),
|
||||||
headlight_upper = 0x04,
|
headlight_upper = ( 1 << 2 ),
|
||||||
headlight_right = 0x10,
|
// TBD, TODO: redmarker_upper support?
|
||||||
redmarker_right = 0x20,
|
headlight_right = ( 1 << 4 ),
|
||||||
rearendsignals = 0x40
|
redmarker_right = ( 1 << 5 ),
|
||||||
|
rearendsignals = ( 1 << 6 ),
|
||||||
|
auxiliary_left = ( 1 << 7 ),
|
||||||
|
auxiliary_right = ( 1 << 8 ),
|
||||||
};
|
};
|
||||||
|
|
||||||
// door operation methods; exclusive
|
// door operation methods; exclusive
|
||||||
|
|||||||
@@ -11327,7 +11327,7 @@ bool TMoverParameters::SendCtrlToNext( std::string const CtrlCommand, double con
|
|||||||
|
|
||||||
// Ra: był problem z propagacją, jeśli w składzie jest pojazd wstawiony odwrotnie
|
// Ra: był problem z propagacją, jeśli w składzie jest pojazd wstawiony odwrotnie
|
||||||
// Ra: problem jest również, jeśli AI będzie na końcu składu
|
// Ra: problem jest również, jeśli AI będzie na końcu składu
|
||||||
OK = ( dir != 0 ); // and Mains;
|
OK = true; // ( dir != 0 ); // experimentally disabled
|
||||||
d = ( 1 + static_cast<int>(Sign( dir )) ) / 2; // dir=-1=>d=0, dir=1=>d=1 - wysyłanie tylko w tył
|
d = ( 1 + static_cast<int>(Sign( dir )) ) / 2; // dir=-1=>d=0, dir=1=>d=1 - wysyłanie tylko w tył
|
||||||
if( OK ) {
|
if( OK ) {
|
||||||
// musi być wybrana niezerowa kabina
|
// musi być wybrana niezerowa kabina
|
||||||
|
|||||||
2
Train.h
2
Train.h
@@ -788,7 +788,7 @@ private:
|
|||||||
int m_pantselection{ 0 };
|
int m_pantselection{ 0 };
|
||||||
bool m_doors{ false }; // helper, true if any door is open
|
bool m_doors{ false }; // helper, true if any door is open
|
||||||
// ld substitute
|
// ld substitute
|
||||||
bool m_couplingdisconnect;
|
bool m_couplingdisconnect { false };
|
||||||
|
|
||||||
public:
|
public:
|
||||||
float fPress[20][3]; // cisnienia dla wszystkich czlonow
|
float fPress[20][3]; // cisnienia dla wszystkich czlonow
|
||||||
|
|||||||
@@ -119,11 +119,11 @@
|
|||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<AdditionalLibraryDirectories>$(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/msvc-$(MSBuildToolsVersion)/$(PlatformShortName);$(SolutionDir)ref/openal/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);$(SolutionDir)ref/libserialport/lib/$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>$(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/msvc-$(MSBuildToolsVersion)/$(PlatformShortName);$(SolutionDir)ref/openal/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);$(SolutionDir)ref/libserialport/lib/$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
<SubSystem>Windows</SubSystem>
|
<SubSystem>Windows</SubSystem>
|
||||||
<IgnoreSpecificDefaultLibraries>
|
<IgnoreSpecificDefaultLibraries>
|
||||||
</IgnoreSpecificDefaultLibraries>
|
</IgnoreSpecificDefaultLibraries>
|
||||||
|
<GenerateDebugInformation>DebugFull</GenerateDebugInformation>
|
||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||||
@@ -139,7 +139,6 @@
|
|||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<AdditionalLibraryDirectories>$(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/msvc-$(MSBuildToolsVersion)/$(PlatformShortName);$(SolutionDir)ref/openal/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);$(SolutionDir)ref/libserialport/lib/$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>$(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/msvc-$(MSBuildToolsVersion)/$(PlatformShortName);$(SolutionDir)ref/openal/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);$(SolutionDir)ref/libserialport/lib/$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
@@ -163,7 +162,6 @@
|
|||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<Link>
|
<Link>
|
||||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
||||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
<OptimizeReferences>true</OptimizeReferences>
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
<AdditionalLibraryDirectories>$(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/msvc-$(MSBuildToolsVersion)/$(PlatformShortName);$(SolutionDir)ref/openal/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);$(SolutionDir)ref/libserialport/lib/$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
<AdditionalLibraryDirectories>$(DXSKD_DIR)lib/$(PlatformShortName);$(SolutionDir)ref/glfw/lib/msvc-$(MSBuildToolsVersion)/$(PlatformShortName);$(SolutionDir)ref/openal/lib/$(PlatformShortName);$(SolutionDir)ref/python/lib/$(PlatformShortName);$(SolutionDir)ref/libserialport/lib/$(PlatformShortName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||||
|
|||||||
Reference in New Issue
Block a user