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

merged upstream changes

Browse Source
This commit is contained in:
tmj-fstate
2017-01-19 19:54:34 +01:00
parent 8fe465afef 3b88ef2356
commit d523ed1bed
14 changed files with 3463 additions and 1817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
McZapkie/Mover.cpp
View File

@@ -4110,7 +4110,7 @@ double TMoverParameters::TractionForce(double dt)
{
case 1:
{
if (ActiveDir != 0)
if (ActiveDir != 0 && RList[MainCtrlActualPos].R > RVentCutOff)
RventRot += (RVentnmax - RventRot) * RVentSpeed * dt;
else
RventRot *= (1.0 - RVentSpeed * dt);

2
McZapkie/_mover.pas
View File

@@ -4085,7 +4085,7 @@ begin
if (EngineType=ElectricSeriesMotor) then
begin
case RVentType of {wentylatory rozruchowe}
1: if ActiveDir<>0 then
1: if (ActiveDir<>0) and (RList[MainCtrlActualPos].R>RVentCutOff) then
RventRot:=RventRot+(RVentnmax-RventRot)*RVentSpeed*dt
else
RventRot:=RventRot*(1-RVentSpeed*dt);