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

Revert "Improve pantograph selector"

Browse Source 
This reverts commit 13d9a91632.
This commit is contained in:
Ryba04
2024-09-10 23:04:17 +02:00
parent 9339c1b8ae
commit f9d04f7397
4 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
McZapkie/MOVER.h
View File

@@ -1205,7 +1205,6 @@ public:
bool UniCtrlIntegratedLocalBrakeCtrl = false; /*zintegrowany nastawnik JH obsluguje hamowanie hamulcem pomocniczym*/ bool UniCtrlIntegratedLocalBrakeCtrl = false; /*zintegrowany nastawnik JH obsluguje hamowanie hamulcem pomocniczym*/
int UniCtrlNoPowerPos{ 0 }; // cached highesr position not generating traction force int UniCtrlNoPowerPos{ 0 }; // cached highesr position not generating traction force
std::pair<std::string, std::array<int, 2>> PantsPreset { "0132", { 0, 0 } }; // pantograph preset switches; .first holds possible setups as chars, .second holds currently selected preset in each cab std::pair<std::string, std::array<int, 2>> PantsPreset { "0132", { 0, 0 } }; // pantograph preset switches; .first holds possible setups as chars, .second holds currently selected preset in each cab
int PantsPresetDefault = 0; // default pantograph preset, this is not updated during simulation
/*-sekcja parametrow dla lokomotywy elektrycznej*/ /*-sekcja parametrow dla lokomotywy elektrycznej*/
TSchemeTable RList; /*lista rezystorow rozruchowych i polaczen silnikow, dla dizla: napelnienia*/ TSchemeTable RList; /*lista rezystorow rozruchowych i polaczen silnikow, dla dizla: napelnienia*/

1
McZapkie/Mover.cpp
View File

@@ -11100,7 +11100,6 @@ void TMoverParameters::LoadFIZ_Switches( std::string const &Input ) {
std::remove( std::begin( presets ), std::end( presets ), '|' ), std::remove( std::begin( presets ), std::end( presets ), '|' ),
std::end( presets ) ); std::end( presets ) );
} }
extract_value( PantsPresetDefault, "PantographPresetDefault", Input, "" );
} }
void TMoverParameters::LoadFIZ_MotorParamTable( std::string const &Input ) { void TMoverParameters::LoadFIZ_MotorParamTable( std::string const &Input ) {

6
Train.cpp
View File

@@ -637,12 +637,6 @@ bool TTrain::Init(TDynamicObject *NewDynamicObject, bool e3d)
DynamicObject->Mechanik->sync_consist_reversers(); DynamicObject->Mechanik->sync_consist_reversers();
} }
// Set the default pantograph preset and update pantographs' valves accordingly.
change_pantograph_selection(mvOccupied->PantsPresetDefault);
// Avoid double update if the default is other than 0.
if (mvOccupied->PantsPresetDefault == 0)
update_pantograph_valves();
return true; return true;
} }

4
Train.h
View File

@@ -211,14 +211,12 @@ class TTrain {
void update_sounds( double const Deltatime ); void update_sounds( double const Deltatime );
void update_sounds_runningnoise( sound_source &Sound ); void update_sounds_runningnoise( sound_source &Sound );
void update_sounds_radio(); void update_sounds_radio();
// Translates the given cab to an end ID: cab `1` and engine compartment (`0`) translate to `end::front`, cab `2` translates to `end::rear`
inline inline
end cab_to_end( int const End ) const { end cab_to_end( int const End ) const {
return ( return (
End == 2 ? End == 2 ?
end::rear : end::rear :
end::front ); } end::front ); }
// Translates the currently occupied cab to an end ID: cab `1` and engine compartment (`0`) translate to `end::front`, cab `2` translates to `end::rear`
inline inline
end cab_to_end() const { end cab_to_end() const {
return cab_to_end( iCabn ); } return cab_to_end( iCabn ); }
@@ -817,7 +815,7 @@ public: // reszta może by?publiczna
*/ */
// McZapkie: opis kabiny - obszar poruszania sie mechanika oraz zajetosc // McZapkie: opis kabiny - obszar poruszania sie mechanika oraz zajetosc
std::array<TCab, 3> Cabine; // przedzial maszynowy, kabina 1 (A), kabina 2 (B) std::array<TCab, 3> Cabine; // przedzial maszynowy, kabina 1 (A), kabina 2 (B)
int iCabn { 0 }; // the cab number the player is currently inside of; 0: mid, 1: front, 2: rear int iCabn { 0 }; // 0: mid, 1: front, 2: rear
bool is_cab_initialized { false }; bool is_cab_initialized { false };
// McZapkie: do poruszania sie po kabinie // McZapkie: do poruszania sie po kabinie
Math3D::vector3 pMechSittingPosition; // ABu 180404 Math3D::vector3 pMechSittingPosition; // ABu 180404