eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-22 02:29:17 +02:00
Code Issues 123 Wiki Activity

securitysystem blink/beep only when powered

Browse Source
This commit is contained in:
milek7
2020-11-01 20:16:58 +01:00
parent c9169edf72
commit 124f6bca0c
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
McZapkie/Mover.cpp
View File

@@ -147,27 +147,42 @@ void TSecuritySystem::update(double dt, double vel, bool pwr) {
} }
void TSecuritySystem::set_cabsignal() { void TSecuritySystem::set_cabsignal() {
if (cabsignal_enabled) if (cabsignal_enabled && power)
cabsignal_active = true; cabsignal_active = true;
} }
bool TSecuritySystem::is_blinking() const { bool TSecuritySystem::is_blinking() const {
if (!power)
return false;
return alert_timer > 0.0; return alert_timer > 0.0;
} }
bool TSecuritySystem::is_vigilance_blinking() const { bool TSecuritySystem::is_vigilance_blinking() const {
if (!power)
return false;
return press_timer > MaxHoldTime || vigilance_timer > AwareDelay; return press_timer > MaxHoldTime || vigilance_timer > AwareDelay;
} }
bool TSecuritySystem::is_cabsignal_blinking() const { bool TSecuritySystem::is_cabsignal_blinking() const {
if (!power)
return false;
return cabsignal_active; return cabsignal_active;
} }
bool TSecuritySystem::is_beeping() const { bool TSecuritySystem::is_beeping() const {
if (!power)
return false;
return alert_timer > SoundSignalDelay && (!separate_acknowledge || is_vigilance_blinking()); return alert_timer > SoundSignalDelay && (!separate_acknowledge || is_vigilance_blinking());
} }
bool TSecuritySystem::is_cabsignal_beeping() const { bool TSecuritySystem::is_cabsignal_beeping() const {
if (!power)
return false;
return alert_timer > SoundSignalDelay && is_cabsignal_blinking(); return alert_timer > SoundSignalDelay && is_cabsignal_blinking();
} }