From 124f6bca0c5ac701b1a6ed1ff00becb89c649b4e Mon Sep 17 00:00:00 2001 From: milek7 Date: Sun, 1 Nov 2020 20:16:58 +0100 Subject: [PATCH] securitysystem blink/beep only when powered --- McZapkie/Mover.cpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index acd3bca8..e2ced6a8 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -147,27 +147,42 @@ void TSecuritySystem::update(double dt, double vel, bool pwr) { } void TSecuritySystem::set_cabsignal() { - if (cabsignal_enabled) + if (cabsignal_enabled && power) cabsignal_active = true; } bool TSecuritySystem::is_blinking() const { + if (!power) + return false; + return alert_timer > 0.0; } bool TSecuritySystem::is_vigilance_blinking() const { + if (!power) + return false; + return press_timer > MaxHoldTime || vigilance_timer > AwareDelay; } bool TSecuritySystem::is_cabsignal_blinking() const { + if (!power) + return false; + return cabsignal_active; } bool TSecuritySystem::is_beeping() const { + if (!power) + return false; + return alert_timer > SoundSignalDelay && (!separate_acknowledge || is_vigilance_blinking()); } bool TSecuritySystem::is_cabsignal_beeping() const { + if (!power) + return false; + return alert_timer > SoundSignalDelay && is_cabsignal_blinking(); }