diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 0c9aab71..e58d7b89 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -1191,7 +1191,6 @@ void TMoverParameters::CollisionDetect(int const End, double const dt) void TMoverParameters::damage_coupler( int const End ) { -return; if( SetFlag( DamageFlag, dtrain_coupling ) ) EventFlag = true; diff --git a/TractionPower.cpp b/TractionPower.cpp index 998da28a..3674b096 100644 --- a/TractionPower.cpp +++ b/TractionPower.cpp @@ -67,15 +67,14 @@ bool TTractionPowerSource::Load(cParser *parser) { // tak około 0.2, wg // http://www.ikolej.pl/fileadmin/user_upload/Seminaria_IK/13_05_07_Prezentacja_Kruczek.pdf InternalRes = 0.2; - } - InternalRes = 0.001; + } return true; }; bool TTractionPowerSource::Update(double dt) { // powinno być wykonane raz na krok fizyki // iloczyn napięcia i admitancji daje prąd - if (0) { + if (NominalVoltage * TotalPreviousAdmitance > MaxOutputCurrent) { FastFuse = true; FuseCounter += 1;