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

security system logic fixes

Browse Source
This commit is contained in:
milek7
2023-05-28 18:39:41 +02:00
parent eaab79703f
commit 2b65410285
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
McZapkie/Mover.cpp
View File

@@ -81,7 +81,7 @@ int DirF(int CouplerN)
} }
void TSecuritySystem::set_enabled(bool e) { void TSecuritySystem::set_enabled(bool e) {
if (vigilance_enabled || cabsignal_enabled) if (vigilance_enabled || cabsignal_enabled || radiostop_enabled)
enabled = e; enabled = e;
if (CabDependent) if (CabDependent)
cabactive = 0; cabactive = 0;
@@ -119,13 +119,8 @@ void TSecuritySystem::cabsignal_reset() {
} }
void TSecuritySystem::update(double dt, double vel, bool pwr, int cab) { void TSecuritySystem::update(double dt, double vel, bool pwr, int cab) {
if (!pwr)
power = false;
if (!enabled)
power = pwr;
if (!enabled || !pwr || DebugModeFlag) { if (!enabled || !pwr || DebugModeFlag) {
power = pwr;
cabsignal_active = false; cabsignal_active = false;
vigilance_timer = 0.0; vigilance_timer = 0.0;
alert_timer = 0.0; alert_timer = 0.0;
@@ -137,7 +132,7 @@ void TSecuritySystem::update(double dt, double vel, bool pwr, int cab) {
bool just_activated = CabDependent && (cabactive != cab); bool just_activated = CabDependent && (cabactive != cab);
/* enabling battery */ /* enabling battery */
if (!DebugModeFlag && cabsignal_enabled && (just_powered_on || just_activated)) { if (cabsignal_enabled && (just_powered_on || just_activated)) {
cabsignal_active = true; cabsignal_active = true;
alert_timer = SoundSignalDelay; alert_timer = SoundSignalDelay;
} }
@@ -203,12 +198,9 @@ bool TSecuritySystem::is_cabsignal_beeping() const {
} }
bool TSecuritySystem::is_braking() const { bool TSecuritySystem::is_braking() const {
if (!power && (vigilance_enabled || cabsignal_enabled || radiostop_enabled)) if (!power && enabled)
return true; return true;
if (!enabled)
return false;
return alert_timer > SoundSignalDelay + EmergencyBrakeDelay; return alert_timer > SoundSignalDelay + EmergencyBrakeDelay;
} }