eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tmj-dev'

Browse Source
This commit is contained in:
milek7
2018-03-09 19:53:05 +01:00
parent 84d610dc4d 0bf9d233aa
commit 65342407bf
16 changed files with 289 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Train.cpp
View File

@@ -204,6 +204,9 @@ TTrain::commandhandler_map const TTrain::m_commandhandlers = {
{ user_command::mubrakingindicatortoggle, &TTrain::OnCommand_mubrakingindicatortoggle },
{ user_command::reverserincrease, &TTrain::OnCommand_reverserincrease },
{ user_command::reverserdecrease, &TTrain::OnCommand_reverserdecrease },
{ user_command::reverserforward, &TTrain::OnCommand_reverserforward },
{ user_command::reverserneutral, &TTrain::OnCommand_reverserneutral },
{ user_command::reverserbackward, &TTrain::OnCommand_reverserbackward },
{ user_command::alerteracknowledge, &TTrain::OnCommand_alerteracknowledge },
{ user_command::batterytoggle, &TTrain::OnCommand_batterytoggle },
{ user_command::batteryenable, &TTrain::OnCommand_batteryenable },
@@ -1398,6 +1401,61 @@ void TTrain::OnCommand_reverserdecrease( TTrain *Train, command_data const &Comm
}
}
void TTrain::OnCommand_reverserforward( TTrain *Train, command_data const &Command ) {
if( Command.action == GLFW_PRESS ) {
if( Train->mvOccupied->ActiveDir < 1 ) {
while( ( Train->mvOccupied->ActiveDir < 1 )
&& ( true == Train->mvOccupied->DirectionForward() ) ) {
// all work is done in the header
}
// aktualizacja skrajnych pojazdów w składzie
if( ( Train->mvOccupied->ActiveDir == 1 )
&& ( Train->DynamicObject->Mechanik ) ) {
Train->DynamicObject->Mechanik->CheckVehicles( Change_direction );
}
}
}
}
void TTrain::OnCommand_reverserneutral( TTrain *Train, command_data const &Command ) {
if( Command.action == GLFW_PRESS ) {
while( ( Train->mvOccupied->ActiveDir < 0 )
&& ( true == Train->mvOccupied->DirectionForward() ) ) {
// all work is done in the header
}
while( ( Train->mvOccupied->ActiveDir > 0 )
&& ( true == Train->mvOccupied->DirectionBackward() ) ) {
// all work is done in the header
}
}
}
void TTrain::OnCommand_reverserbackward( TTrain *Train, command_data const &Command ) {
if( Command.action == GLFW_PRESS ) {
if( Train->mvOccupied->ActiveDir > -1 ) {
while( ( Train->mvOccupied->ActiveDir > -1 )
&& ( true == Train->mvOccupied->DirectionBackward() ) ) {
// all work is done in the header
}
// aktualizacja skrajnych pojazdów w składzie
if( ( Train->mvOccupied->ActiveDir == -1 )
&& ( Train->DynamicObject->Mechanik ) ) {
Train->DynamicObject->Mechanik->CheckVehicles( Change_direction );
}
}
}
}
void TTrain::OnCommand_alerteracknowledge( TTrain *Train, command_data const &Command ) {
if( Command.action == GLFW_PRESS ) {
@@ -5770,8 +5828,8 @@ void TTrain::clear_cab_controls()
btLampkaOgrzewanieSkladu.Clear(11);
btHaslerBrakes.Clear(12); // ciśnienie w cylindrach do odbijania na haslerze
btHaslerCurrent.Clear(13); // prąd na silnikach do odbijania na haslerze
// Jeśli ustawiamy nową wartość dla PoKeys wolna jest 15
// Numer 14 jest używany dla buczka SHP w update_sounds()
// Jeśli ustawiamy nową wartość dla PoKeys wolna jest 15
// other cab controls
// TODO: arrange in more readable manner, and eventually refactor