diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp index 9fbe5b3d..1e07591b 100644 --- a/McZapkie/Mover.cpp +++ b/McZapkie/Mover.cpp @@ -3173,18 +3173,7 @@ bool TMoverParameters::DecBrakePress(double &brake, double PressLimit, double dp bool TMoverParameters::BrakeDelaySwitch(int BDS) { bool rBDS; - // if (BrakeCtrlPosNo > 0) - if (BrakeHandle == TBrakeHandle::MHZ_EN57) - { - if ((BDS != BrakeOpModeFlag) && ((BDS & BrakeOpModes) > 0)) - { - BrakeOpModeFlag = BDS; - rBDS = true; - } - else - rBDS = false; - } - else if (Hamulec->SetBDF(BDS)) + if (Hamulec->SetBDF(BDS)) { BrakeDelayFlag = BDS; rBDS = true; diff --git a/scene.cpp b/scene.cpp index cdc06b43..1fc6f706 100644 --- a/scene.cpp +++ b/scene.cpp @@ -762,7 +762,7 @@ basic_section::insert( shape_node Shape ) { // re-calculate section radius, in case shape geometry extends outside the section's boundaries m_area.radius = std::max( m_area.radius, - static_cast( glm::length( m_area.center - shapedata.area.center ) + shapedata.area.radius ) ); + static_cast( glm::length( m_area.center - shapedata.area.center ) + Shape.radius() ) ); if( ( true == shapedata.translucent ) || ( shapedata.rangesquared_max <= 90000.0 ) diff --git a/scenenode.h b/scenenode.h index 65be6507..05431fec 100644 --- a/scenenode.h +++ b/scenenode.h @@ -140,6 +140,7 @@ public: shapenode_data const & data() const; // get bounding radius + // NOTE: use this method instead of direct access to the data member, due to lazy radius evaluation float radius(); private: diff --git a/version.h b/version.h index 2c3d40ad..4a74c1c6 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #pragma once #define VERSION_MAJOR 19 -#define VERSION_MINOR 103 +#define VERSION_MINOR 116 #define VERSION_REVISION 0