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

tymczasowe przywrócenie tekstu, porządek, wywalenie starych plików, warningi, cmake, itp.

Browse Source
This commit is contained in:
VB
2017-02-14 19:13:48 +01:00
parent 95e040f874
commit 92f39cd9b9
194 changed files with 612 additions and 74277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Train.cpp
View File

@@ -428,7 +428,7 @@ void TTrain::OnKeyDown(int cKey)
else if (cKey == Global::Keys[k_DirectionBackward])
{
if (mvOccupied->Radio == false)
if (Global::ctrlState >= 0)
if (Global::ctrlState)
{
dsbSwitch->SetVolume(DSBVOLUME_MAX);
dsbSwitch->Play(0, 0, 0);
@@ -1864,9 +1864,8 @@ if
ctrain_pneumatic))
{
rsHiss.Play(1, DSBPLAY_LOOPING, true, tmp->GetPosition());
DynamicObject->SetPneumatic(CouplNr,
1); // Ra: to mi się nie podoba !!!!
tmp->SetPneumatic(CouplNr, 1);
DynamicObject->SetPneumatic(CouplNr != 0, true); // Ra: to mi się nie podoba !!!!
tmp->SetPneumatic(CouplNr != 0, true);
}
}
else if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag,
@@ -1886,9 +1885,8 @@ if
// rsHiss.Play(1,DSBPLAY_LOOPING,true,tmp->GetPosition());
dsbCouplerDetach->SetVolume(DSBVOLUME_MAX);
dsbCouplerDetach->Play(0, 0, 0);
DynamicObject->SetPneumatic(CouplNr,
0); // Ra: to mi się nie podoba !!!!
tmp->SetPneumatic(CouplNr, 0);
DynamicObject->SetPneumatic(CouplNr != 0, false); // Ra: to mi się nie podoba !!!!
tmp->SetPneumatic(CouplNr != 0, false);
}
}
else if (!TestFlag(tmp->MoverParameters->Couplers[CouplNr].CouplingFlag,
@@ -1926,8 +1924,8 @@ if
// rsHiss.Play(1,DSBPLAY_LOOPING,true,tmp->GetPosition());
dsbCouplerDetach->SetVolume(DSBVOLUME_MAX);
dsbCouplerDetach->Play(0, 0, 0);
DynamicObject->SetPneumatic(CouplNr, 0);
tmp->SetPneumatic(CouplNr, 0);
DynamicObject->SetPneumatic(CouplNr != 0, false);
tmp->SetPneumatic(CouplNr != 0, false);
}
}
}
@@ -5067,7 +5065,6 @@ bool TTrain::CabChange(int iDirection)
// wczytywanie pliku z danymi multimedialnymi (dzwieki, kontrolki, kabiny)
bool TTrain::LoadMMediaFile(std::string const &asFileName)
{
double dSDist;
cParser parser(asFileName, cParser::buffer_FILE);
// NOTE: yaml-style comments are disabled until conflict in use of # is resolved
// parser.addCommentStyle( "#", "\n" );
@@ -5374,7 +5371,6 @@ bool TTrain::InitializeCab(int NewCabNo, std::string const &asFileName)
pyScreens.reset(this);
pyScreens.setLookupPath(DynamicObject->asBaseDir);
bool parse = false;
double dSDist;
int cabindex = 0;
DynamicObject->mdKabina = NULL; // likwidacja wskaźnika na dotychczasową kabinę
switch (NewCabNo)