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

Dodane wszystkie pominięte rzeczy z asynch17

Browse Source
This commit is contained in:
firleju
2016-03-16 22:13:10 +01:00
parent 880bbea785
commit 6c54b75f62
1 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Train.cpp
View File

@@ -1680,14 +1680,18 @@ void TTrain::OnKeyDown(int cKey)
} }
*/ */
if (mvControlled->TrainType == dt_EZT) if (mvControlled->TrainType == dt_EZT)
{
if (ggDoorSignallingButton.SubModel != NULL)
{ {
if (mvControlled->DoorSignalling) if (mvControlled->DoorSignalling)
{ {
mvOccupied->DoorBlocked = false;
dsbSwitch->Play(0, 0, 0); dsbSwitch->Play(0, 0, 0);
mvControlled->DoorSignalling = false; mvControlled->DoorSignalling = false;
} }
} }
} }
}
else if (cKey == Global::Keys[k_CabForward]) else if (cKey == Global::Keys[k_CabForward])
{ {
if (!CabChange(1)) if (!CabChange(1))
@@ -4307,10 +4311,14 @@ bool TTrain::Update()
*/ */
if (Console::Pressed(Global::Keys[k_Sand])) if (Console::Pressed(Global::Keys[k_Sand]))
{
if (mvControlled->TrainType != dt_EZT && ggSandButton.SubModel != NULL)
{ {
mvControlled->SandDose = true; mvControlled->SandDose = true;
ggSandButton.PutValue(1);
// mvControlled->SandDoseOn(true); // mvControlled->SandDoseOn(true);
} }
}
else else
{ {
mvControlled->SandDose = false; mvControlled->SandDose = false;
@@ -4906,6 +4914,7 @@ bool TTrain::Update()
ggSecurityResetButton.Update(); ggSecurityResetButton.Update();
ggReleaserButton.Update(); ggReleaserButton.Update();
ggAntiSlipButton.Update(); ggAntiSlipButton.Update();
ggSandButton.Update();
ggFuseButton.Update(); ggFuseButton.Update();
ggConverterFuseButton.Update(); ggConverterFuseButton.Update();
ggStLinOffButton.Update(); ggStLinOffButton.Update();
@@ -4948,6 +4957,7 @@ bool TTrain::Update()
ggMainOnButton.UpdateValue(0); ggMainOnButton.UpdateValue(0);
ggSecurityResetButton.UpdateValue(0); ggSecurityResetButton.UpdateValue(0);
ggReleaserButton.UpdateValue(0); ggReleaserButton.UpdateValue(0);
ggSandButton.UpdateValue(0);
ggAntiSlipButton.UpdateValue(0); ggAntiSlipButton.UpdateValue(0);
ggDepartureSignalButton.UpdateValue(0); ggDepartureSignalButton.UpdateValue(0);
ggFuseButton.UpdateValue(0); ggFuseButton.UpdateValue(0);
@@ -5395,6 +5405,7 @@ bool TTrain::InitializeCab(int NewCabNo, AnsiString asFileName)
ggMainOnButton.Clear(); ggMainOnButton.Clear();
ggSecurityResetButton.Clear(); ggSecurityResetButton.Clear();
ggReleaserButton.Clear(); ggReleaserButton.Clear();
ggSandButton.Clear();
ggAntiSlipButton.Clear(); ggAntiSlipButton.Clear();
ggHornButton.Clear(); ggHornButton.Clear();
ggNextCurrentButton.Clear(); ggNextCurrentButton.Clear();
@@ -5549,8 +5560,8 @@ bool TTrain::InitializeCab(int NewCabNo, AnsiString asFileName)
ggSecurityResetButton.Load(Parser, DynamicObject->mdKabina); ggSecurityResetButton.Load(Parser, DynamicObject->mdKabina);
else if (str == AnsiString("releaser_bt:")) // przycisk odluzniacza else if (str == AnsiString("releaser_bt:")) // przycisk odluzniacza
ggReleaserButton.Load(Parser, DynamicObject->mdKabina); ggReleaserButton.Load(Parser, DynamicObject->mdKabina);
else if (str == AnsiString("releaser_bt:")) // przycisk odluzniacza else if (str == AnsiString("sand_bt:")) // przycisk piasecznicy
ggReleaserButton.Load(Parser, DynamicObject->mdKabina); ggSandButton.Load(Parser, DynamicObject->mdKabina);
else if (str == AnsiString("antislip_bt:")) // przycisk antyposlizgowy else if (str == AnsiString("antislip_bt:")) // przycisk antyposlizgowy
ggAntiSlipButton.Load(Parser, DynamicObject->mdKabina); ggAntiSlipButton.Load(Parser, DynamicObject->mdKabina);
else if (str == AnsiString("horn_bt:")) // dzwignia syreny else if (str == AnsiString("horn_bt:")) // dzwignia syreny
@@ -5619,7 +5630,7 @@ bool TTrain::InitializeCab(int NewCabNo, AnsiString asFileName)
ggSignallingButton.Load(Parser, DynamicObject->mdKabina); ggSignallingButton.Load(Parser, DynamicObject->mdKabina);
else if (str == AnsiString("door_signalling_sw:")) // Sygnalizacja blokady drzwi else if (str == AnsiString("door_signalling_sw:")) // Sygnalizacja blokady drzwi
ggDoorSignallingButton.Load(Parser, DynamicObject->mdKabina); ggDoorSignallingButton.Load(Parser, DynamicObject->mdKabina);
else if (str == AnsiString("nextcurrent_sw:")) // grzanie skladu else if (str == AnsiString("nextcurrent_sw:")) // pr¹d drugiego cz³onu
ggNextCurrentButton.Load(Parser, DynamicObject->mdKabina); ggNextCurrentButton.Load(Parser, DynamicObject->mdKabina);
else if (str == AnsiString("cablight_sw:")) // hunter-091012: swiatlo w kabinie else if (str == AnsiString("cablight_sw:")) // hunter-091012: swiatlo w kabinie
ggCabLightButton.Load(Parser, DynamicObject->mdKabina); ggCabLightButton.Load(Parser, DynamicObject->mdKabina);