mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-03-22 15:05:03 +01:00
Now dimmer OFF position affects also end signals
This commit is contained in:
20
DynObj.cpp
20
DynObj.cpp
@@ -1126,11 +1126,13 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (TestFlag(MoverParameters->iLights[end::front], light::redmarker_left)) {
|
if (TestFlag(MoverParameters->iLights[end::front], light::redmarker_left) && !HeadlightsAoff)
|
||||||
|
{
|
||||||
m_endsignal13.Turn( true );
|
m_endsignal13.Turn( true );
|
||||||
btnOn = true;
|
btnOn = true;
|
||||||
}
|
}
|
||||||
if (TestFlag(MoverParameters->iLights[end::front], light::redmarker_right)) {
|
if (TestFlag(MoverParameters->iLights[end::front], light::redmarker_right) && !HeadlightsAoff)
|
||||||
|
{
|
||||||
m_endsignal12.Turn( true );
|
m_endsignal12.Turn( true );
|
||||||
btnOn = true;
|
btnOn = true;
|
||||||
}
|
}
|
||||||
@@ -1142,11 +1144,13 @@ void TDynamicObject::ABuLittleUpdate(double ObjSqrDist)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (TestFlag(MoverParameters->iLights[end::rear], light::redmarker_left)) {
|
if (TestFlag(MoverParameters->iLights[end::rear], light::redmarker_left) && !HeadlightsBoff)
|
||||||
|
{
|
||||||
m_endsignal23.Turn( true );
|
m_endsignal23.Turn( true );
|
||||||
btnOn = true;
|
btnOn = true;
|
||||||
}
|
}
|
||||||
if (TestFlag(MoverParameters->iLights[end::rear], light::redmarker_right)) {
|
if (TestFlag(MoverParameters->iLights[end::rear], light::redmarker_right) && !HeadlightsBoff)
|
||||||
|
{
|
||||||
m_endsignal22.Turn( true );
|
m_endsignal22.Turn( true );
|
||||||
btnOn = true;
|
btnOn = true;
|
||||||
}
|
}
|
||||||
@@ -7398,7 +7402,7 @@ void TDynamicObject::RaLightsSet(int head, int rear)
|
|||||||
HeadlightsAoff = true;
|
HeadlightsAoff = true;
|
||||||
break;
|
break;
|
||||||
case end::rear:
|
case end::rear:
|
||||||
HeadlightsAoff = true;
|
HeadlightsBoff = true;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
@@ -7412,7 +7416,7 @@ void TDynamicObject::RaLightsSet(int head, int rear)
|
|||||||
HeadlightsAoff = false;
|
HeadlightsAoff = false;
|
||||||
break;
|
break;
|
||||||
case end::rear:
|
case end::rear:
|
||||||
HeadlightsAoff = false;
|
HeadlightsBoff = false;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
@@ -7462,7 +7466,7 @@ void TDynamicObject::SetLightDimmings()
|
|||||||
HeadlightsAoff = true;
|
HeadlightsAoff = true;
|
||||||
break;
|
break;
|
||||||
case end::rear:
|
case end::rear:
|
||||||
HeadlightsAoff = true;
|
HeadlightsBoff = true;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
@@ -7476,7 +7480,7 @@ void TDynamicObject::SetLightDimmings()
|
|||||||
HeadlightsAoff = false;
|
HeadlightsAoff = false;
|
||||||
break;
|
break;
|
||||||
case end::rear:
|
case end::rear:
|
||||||
HeadlightsAoff = false;
|
HeadlightsBoff = false;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user