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

default radio state tweak, minor bug fixes

Browse Source
This commit is contained in:
tmj-fstate
2020-10-17 22:56:01 +02:00
parent ef200df575
commit af3a724ede
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Driver.cpp
View File

@@ -2702,6 +2702,7 @@ bool TController::PrepareEngine()
if (AIControllFlag) { if (AIControllFlag) {
// część wykonawcza dla sterowania przez komputer // część wykonawcza dla sterowania przez komputer
mvOccupied->BatterySwitch( true ); mvOccupied->BatterySwitch( true );
mvOccupied->Radio = true;
if( ( mvControlling->EngineType == TEngineType::DieselElectric ) if( ( mvControlling->EngineType == TEngineType::DieselElectric )
|| ( mvControlling->EngineType == TEngineType::DieselEngine ) ) { || ( mvControlling->EngineType == TEngineType::DieselEngine ) ) {
mvControlling->OilPumpSwitch( true ); mvControlling->OilPumpSwitch( true );
@@ -2945,6 +2946,7 @@ bool TController::ReleaseEngine() {
mvOccupied->IncManualBrakeLevel( ManualBrakePosNo ); mvOccupied->IncManualBrakeLevel( ManualBrakePosNo );
} }
// switch off remaining power // switch off remaining power
mvOccupied->Radio = false;
mvOccupied->BatterySwitch( false ); mvOccupied->BatterySwitch( false );
} }
} }

2
McZapkie/MOVER.h
View File

@@ -1034,7 +1034,7 @@ public:
start_t BatteryStart = start_t::manual; start_t BatteryStart = start_t::manual;
bool EpFuse = true; /*Czy sa zalavzone baterie*/ bool EpFuse = true; /*Czy sa zalavzone baterie*/
bool Signalling = false; /*Czy jest zalaczona sygnalizacja hamowania ostatniego wagonu*/ bool Signalling = false; /*Czy jest zalaczona sygnalizacja hamowania ostatniego wagonu*/
bool Radio = true; /*Czy jest zalaczony radiotelefon*/ bool Radio = false; /*Czy jest zalaczony radiotelefon*/
float NominalBatteryVoltage = 0.f; /*Winger - baterie w elektrykach*/ float NominalBatteryVoltage = 0.f; /*Winger - baterie w elektrykach*/
TDimension Dim; /*wymiary*/ TDimension Dim; /*wymiary*/
double Cx = 0.0; /*wsp. op. aerodyn.*/ double Cx = 0.0; /*wsp. op. aerodyn.*/

4
Train.cpp
View File

@@ -590,15 +590,13 @@ dictionary_source *TTrain::GetTrainState() {
dict->insert( "manual_brake", ( mvOccupied->ManualBrakePos > 0 ) ); dict->insert( "manual_brake", ( mvOccupied->ManualBrakePos > 0 ) );
bool const bEP = ( mvControlled->LocHandle->GetCP() > 0.2 ) || ( fEIMParams[ 0 ][ 5 ] > 0.01 ); bool const bEP = ( mvControlled->LocHandle->GetCP() > 0.2 ) || ( fEIMParams[ 0 ][ 5 ] > 0.01 );
dict->insert( "dir_brake", bEP ); dict->insert( "dir_brake", bEP );
bool bPN; bool bPN { false };
if( ( typeid( *mvOccupied->Hamulec ) == typeid( TLSt ) ) if( ( typeid( *mvOccupied->Hamulec ) == typeid( TLSt ) )
|| ( typeid( *mvOccupied->Hamulec ) == typeid( TEStED ) ) ) { || ( typeid( *mvOccupied->Hamulec ) == typeid( TEStED ) ) ) {
TBrake* temp_ham = mvOccupied->Hamulec.get(); TBrake* temp_ham = mvOccupied->Hamulec.get();
bPN = ( static_cast<TLSt*>( temp_ham )->GetEDBCP() > 0.2 ); bPN = ( static_cast<TLSt*>( temp_ham )->GetEDBCP() > 0.2 );
} }
else
bPN = false;
dict->insert( "indir_brake", bPN ); dict->insert( "indir_brake", bPN );
dict->insert( "brake_delay_flag", mvOccupied->BrakeDelayFlag ); dict->insert( "brake_delay_flag", mvOccupied->BrakeDelayFlag );
dict->insert( "brake_op_mode_flag", mvOccupied->BrakeOpModeFlag ); dict->insert( "brake_op_mode_flag", mvOccupied->BrakeOpModeFlag );

3
application.cpp
View File

@@ -740,7 +740,8 @@ eu07_application::init_glfw() {
monitor = glfwGetPrimaryMonitor(); monitor = glfwGetPrimaryMonitor();
glfwWindowHint( GLFW_AUTO_ICONIFY, GLFW_FALSE ); glfwWindowHint( GLFW_AUTO_ICONIFY, GLFW_FALSE );
if( Global.iMultisampling > 0 ) { glfwWindowHint( GLFW_FLOATING, GLFW_FALSE );
if( ( Global.iMultisampling > 0 ) && ( Global.gfx_skippipeline ) ) {
glfwWindowHint( GLFW_SAMPLES, 1 << Global.iMultisampling ); glfwWindowHint( GLFW_SAMPLES, 1 << Global.iMultisampling );
} }