mirror of
https://github.com/MaSzyna-EU07/maszyna.git
synced 2026-11-20 09:15:01 +01:00
Merge remote-tracking branch 'origin/master' into feat/persistent-odometer-store
# Conflicts: # vehicle/Train.cpp
This commit is contained in:
@@ -18,6 +18,7 @@ http://mozilla.org/MPL/2.0/.
|
||||
#include "vehicle/linebreaker.h"
|
||||
#include "vehicle/holdcoillever.h"
|
||||
#include "vehicle/odometer.h"
|
||||
#include "vehicle/mainctrlact.h"
|
||||
|
||||
#include "utilities/Globals.h"
|
||||
#include "simulation/simulation.h"
|
||||
@@ -9699,10 +9700,7 @@ bool TTrain::Update(double const Deltatime)
|
||||
}
|
||||
if (ggMainCtrlAct.SubModel != nullptr)
|
||||
{
|
||||
if (mvControlled->CoupledCtrl)
|
||||
ggMainCtrlAct.UpdateValue(static_cast<float>(double(mvControlled->MainCtrlActualPos + mvControlled->ScndCtrlActualPos)));
|
||||
else
|
||||
ggMainCtrlAct.UpdateValue(static_cast<float>(double(mvControlled->MainCtrlActualPos)));
|
||||
ggMainCtrlAct.UpdateValue(main_ctrl_act::position(*mvControlled, ggMainCtrlAct.has_scaletable()));
|
||||
ggMainCtrlAct.Update();
|
||||
}
|
||||
if (ggScndCtrl.SubModel != nullptr)
|
||||
|
||||
Reference in New Issue
Block a user