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

fix broken command alignment

Browse Source
This commit is contained in:
milek7
2019-09-08 00:24:13 +02:00
parent 745fe34509
commit 0d32ec1e9e
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
McZapkie/Mover.cpp
View File

@@ -1191,7 +1191,7 @@ void TMoverParameters::CollisionDetect(int const End, double const dt)
void void
TMoverParameters::damage_coupler( int const End ) { TMoverParameters::damage_coupler( int const End ) {
return;
if( SetFlag( DamageFlag, dtrain_coupling ) ) if( SetFlag( DamageFlag, dtrain_coupling ) )
EventFlag = true; EventFlag = true;

5
TractionPower.cpp
View File

@@ -66,15 +66,16 @@ bool TTractionPowerSource::Load(cParser *parser) {
// coś mała ta rezystancja była... // coś mała ta rezystancja była...
// tak około 0.2, wg // tak około 0.2, wg
// http://www.ikolej.pl/fileadmin/user_upload/Seminaria_IK/13_05_07_Prezentacja_Kruczek.pdf // http://www.ikolej.pl/fileadmin/user_upload/Seminaria_IK/13_05_07_Prezentacja_Kruczek.pdf
InternalRes = 0.2; InternalRes = 0.2;
} }
InternalRes = 0.001;
return true; return true;
}; };
bool TTractionPowerSource::Update(double dt) bool TTractionPowerSource::Update(double dt)
{ // powinno być wykonane raz na krok fizyki { // powinno być wykonane raz na krok fizyki
// iloczyn napięcia i admitancji daje prąd // iloczyn napięcia i admitancji daje prąd
if (NominalVoltage * TotalPreviousAdmitance > MaxOutputCurrent) { if (0) {
FastFuse = true; FastFuse = true;
FuseCounter += 1; FuseCounter += 1;

14
command.cpp
View File

@@ -231,6 +231,13 @@ commanddescription_sequence Commands_descriptions = {
{ "motorblowersdisableall", command_target::vehicle, command_mode::oneoff }, { "motorblowersdisableall", command_target::vehicle, command_mode::oneoff },
{ "coolingfanstoggle", command_target::vehicle, command_mode::oneoff }, { "coolingfanstoggle", command_target::vehicle, command_mode::oneoff },
{ "tempomattoggle", command_target::vehicle, command_mode::oneoff }, { "tempomattoggle", command_target::vehicle, command_mode::oneoff },
{ "springbraketoggle", command_target::vehicle, command_mode::oneoff },
{ "springbrakeenable", command_target::vehicle, command_mode::oneoff },
{ "springbrakedisable", command_target::vehicle, command_mode::oneoff },
{ "springbrakeshutofftoggle", command_target::vehicle, command_mode::oneoff },
{ "springbrakeshutoffenable", command_target::vehicle, command_mode::oneoff },
{ "springbrakeshutoffdisable", command_target::vehicle, command_mode::oneoff },
{ "springbrakerelease", command_target::vehicle },
{ "globalradiostop", command_target::simulation, command_mode::oneoff }, { "globalradiostop", command_target::simulation, command_mode::oneoff },
{ "timejump", command_target::simulation, command_mode::oneoff }, { "timejump", command_target::simulation, command_mode::oneoff },
{ "timejumplarge", command_target::simulation, command_mode::oneoff }, { "timejumplarge", command_target::simulation, command_mode::oneoff },
@@ -259,13 +266,6 @@ commanddescription_sequence Commands_descriptions = {
{ "spawntrainset", command_target::simulation, command_mode::oneoff }, { "spawntrainset", command_target::simulation, command_mode::oneoff },
{ "destroytrainset", command_target::simulation, command_mode::oneoff }, { "destroytrainset", command_target::simulation, command_mode::oneoff },
{ "quitsimulation", command_target::simulation, command_mode::oneoff }, { "quitsimulation", command_target::simulation, command_mode::oneoff },
{ "springbraketoggle", command_target::vehicle, command_mode::oneoff },
{ "springbrakeenable", command_target::vehicle, command_mode::oneoff },
{ "springbrakedisable", command_target::vehicle, command_mode::oneoff },
{ "springbrakeshutofftoggle", command_target::vehicle, command_mode::oneoff },
{ "springbrakeshutoffenable", command_target::vehicle, command_mode::oneoff },
{ "springbrakeshutoffdisable", command_target::vehicle, command_mode::oneoff },
{ "springbrakerelease", command_target::vehicle }
}; };
} // simulation } // simulation