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

changes for consistency with shader version

Browse Source
This commit is contained in:
milek7
2018-11-02 12:48:59 +01:00
parent 19f1f62e93
commit 0d644561f9
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
McZapkie/Mover.cpp
View File

@@ -7453,6 +7453,11 @@ bool TMoverParameters::LoadFIZ(std::string chkpath)
// guard against malformed config files with leading spaces // guard against malformed config files with leading spaces
inputline.erase( 0, inputline.find_first_not_of( ' ' ) ); inputline.erase( 0, inputline.find_first_not_of( ' ' ) );
} }
// trim CR at end (mainly for linux)
if (!inputline.empty() && inputline.back() == '\r')
inputline.pop_back();
if( inputline.length() == 0 ) { if( inputline.length() == 0 ) {
startBPT = false; startBPT = false;
continue; continue;

17
Train.cpp
View File

@@ -657,7 +657,6 @@ void TTrain::set_master_controller( double const Position ) {
void TTrain::set_train_brake( double const Position ) { void TTrain::set_train_brake( double const Position ) {
auto const originalbrakeposition { static_cast<int>( 100.0 * mvOccupied->fBrakeCtrlPos ) }; auto const originalbrakeposition { static_cast<int>( 100.0 * mvOccupied->fBrakeCtrlPos ) };
mvOccupied->BrakeLevelSet( Position ); mvOccupied->BrakeLevelSet( Position );
if( static_cast<int>( 100.0 * mvOccupied->fBrakeCtrlPos ) == originalbrakeposition ) { return; } if( static_cast<int>( 100.0 * mvOccupied->fBrakeCtrlPos ) == originalbrakeposition ) { return; }
@@ -1020,14 +1019,14 @@ void TTrain::OnCommand_independentbrakebailoff( TTrain *Train, command_data cons
void TTrain::OnCommand_trainbrakeincrease( TTrain *Train, command_data const &Command ) { void TTrain::OnCommand_trainbrakeincrease( TTrain *Train, command_data const &Command ) {
if (Command.action == GLFW_REPEAT && Train->mvOccupied->BrakeHandle == TBrakeHandle::FV4a) if (Command.action == GLFW_REPEAT && Train->mvOccupied->BrakeHandle == TBrakeHandle::FV4a)
Train->mvOccupied->BrakeLevelAdd( Global.brake_speed * Command.time_delta ); Train->mvOccupied->BrakeLevelAdd( Global.brake_speed * Command.time_delta * Train->mvOccupied->BrakeCtrlPosNo );
else if (Command.action == GLFW_PRESS && Train->mvOccupied->BrakeHandle != TBrakeHandle::FV4a) else if (Command.action == GLFW_PRESS && Train->mvOccupied->BrakeHandle != TBrakeHandle::FV4a)
Train->set_train_brake( Train->mvOccupied->fBrakeCtrlPos + Global.fBrakeStep ); Train->set_train_brake( Train->mvOccupied->fBrakeCtrlPos + Global.fBrakeStep );
} }
void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Command ) { void TTrain::OnCommand_trainbrakedecrease( TTrain *Train, command_data const &Command ) {
if (Command.action == GLFW_REPEAT && Train->mvOccupied->BrakeHandle == TBrakeHandle::FV4a) if (Command.action == GLFW_REPEAT && Train->mvOccupied->BrakeHandle == TBrakeHandle::FV4a)
Train->mvOccupied->BrakeLevelAdd( -Global.brake_speed * Command.time_delta ); Train->mvOccupied->BrakeLevelAdd( -Global.brake_speed * Command.time_delta * Train->mvOccupied->BrakeCtrlPosNo );
else if (Command.action == GLFW_PRESS && Train->mvOccupied->BrakeHandle != TBrakeHandle::FV4a) else if (Command.action == GLFW_PRESS && Train->mvOccupied->BrakeHandle != TBrakeHandle::FV4a)
Train->set_train_brake( Train->mvOccupied->fBrakeCtrlPos - Global.fBrakeStep ); Train->set_train_brake( Train->mvOccupied->fBrakeCtrlPos - Global.fBrakeStep );
@@ -4972,18 +4971,6 @@ bool TTrain::Update( double const Deltatime )
} }
} }
} }
if( ( mvOccupied->BrakeHandle == TBrakeHandle::FVel6 )
&& ( mvOccupied->fBrakeCtrlPos < 0.0 )
&& ( Global.iFeedbackMode < 3 ) ) {
// Odskakiwanie hamulce EP
if( false == (
( input::command == user_command::trainbrakeset )
|| ( input::command == user_command::trainbrakedecrease )
|| ( input::command == user_command::trainbrakecharging ) ) ) {
set_train_brake( 0 );
}
}
} }
// McZapkie: predkosc wyswietlana na tachometrze brana jest z obrotow kol // McZapkie: predkosc wyswietlana na tachometrze brana jest z obrotow kol