From 54812e83465cb7caf903bdbc194c4d505e58a423 Mon Sep 17 00:00:00 2001 From: milek7 Date: Sun, 1 Nov 2020 22:53:34 +0100 Subject: [PATCH] securitysystem workarounds --- McZapkie/Mover.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index ceab91c4..d7dac540 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -192,6 +192,9 @@ bool TSecuritySystem::is_cabsignal_beeping() const { } bool TSecuritySystem::is_braking() const { + if (!enabled) + return false; + if (!power && (vigilance_enabled || cabsignal_enabled)) return true; @@ -4297,7 +4300,7 @@ void TMoverParameters::UpdatePipePressure(double dt) || ( true == AlarmChainFlag ) || (( true == EIMCtrlEmergency) && (LocalBrakePosA >= 1.0)) - || SecuritySystem.is_braking()) && CabOccupied ) + || SecuritySystem.is_braking())) /* // NOTE: disabled because 32 is 'load destroyed' flag, what does this have to do with emergency brake? // (if it's supposed to be broken coupler, such event sets alarmchainflag instead when appropriate)