eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 06:39:18 +02:00
Code Issues 121 Wiki Activity

Merge with 474next6p1

Browse Source
This commit is contained in:
firleju
2016-01-27 14:15:49 +01:00
parent a46a120ffc d659f8e9c1
commit 46ea2dde39
7 changed files with 241 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Train.cpp
View File

@@ -3958,14 +3958,20 @@ bool TTrain::Update()
TestFlag(mvOccupied->SecuritySystem.Status, s_SHPalarm))
{
dsbBuzzer->GetStatus(&stat);
if (!(stat & DSBSTATUS_PLAYING))
if (!(stat & DSBSTATUS_PLAYING))
{
dsbBuzzer->Play(0, 0, DSBPLAY_LOOPING);
Console::BitsSet(1 << 14); // ustawienie bitu 16 na PoKeys
}
}
else
{
dsbBuzzer->GetStatus(&stat);
if (stat & DSBSTATUS_PLAYING)
if (stat & DSBSTATUS_PLAYING)
{
dsbBuzzer->Stop();
Console::BitsClear(1 << 14); // ustawienie bitu 16 na PoKeys
}
}
}
else // wylaczone
@@ -3973,8 +3979,11 @@ bool TTrain::Update()
btLampkaCzuwaka.TurnOff();
btLampkaSHP.TurnOff();
dsbBuzzer->GetStatus(&stat);
if (stat & DSBSTATUS_PLAYING)
if (stat & DSBSTATUS_PLAYING)
{
dsbBuzzer->Stop();
Console::BitsClear(1 << 14); // ustawienie bitu 16 na PoKeys
}
}
//******************************************
@@ -5280,6 +5289,8 @@ bool TTrain::InitializeCab(int NewCabNo, AnsiString asFileName)
// ggEngageRatio.Clear();
ggMainGearStatus.Clear();
ggIgnitionKey.Clear();
// Jeœli ustawiamy now¹ wartoœæ dla PoKeys wolna jest 15
// Numer 14 jest u¿ywany dla buczka SHP w innym miejscu
btLampkaPoslizg.Clear(6);
btLampkaStyczn.Clear(5);
btLampkaNadmPrzetw.Clear(